--- a/marccore.php	Mon Nov 17 01:19:05 2014 +0100
+++ b/marccore.php	Sat Nov 22 18:18:52 2014 +0100
@@ -99,25 +99,22 @@
 		if (isset($upd['transfer']) && (strlen($upd['transfer']) != 0 && strlen($upd['transfer']) != NACL_CRYPTO_SIGN_ed25519_PUBLICKEYBYTES)) throw new Exception('Transfer recipient key is not valid');
 		if ($current) {
 			unset($upd['transferchain']);
-			if (isset($current['transferchain']) && ($chain = self::Decode($current['transferchain'])) && $chain->Verify() && $chain->serial >= time() - 365*24*60*60 && isset($chain->transfer) && ($chain->transfer == $upd['key'] || ($upd['key'] == $current['key'] && !strlen($chain->transfer)))) {
-				$upd['transferchain'] = $current['transferchain'];
-			} elseif (isset($current['transfer']) && isset($current['updatemessage']) && $current['serial'] >= time() - 365*24*60*60 && isset($current['transfer']) && ($current['transfer'] == $upd['key'] || !strlen($current['transfer']))) {
-				$upd['transferchain'] = $current['updatemessage'];
+			if (isset($current['transferchain']) && ($chain = self::Decode($current['transferchain'])) && $chain->Verify() && ($current['key'] == $upd['key'] || ($chain->key == $current['key'] && $chain->serial == $current['serial']))) {
+				$chain = $chain;
+			} elseif (isset($current['updatemessage']) && $current['key'] != $upd['key']) {
+				$chain = $current;
+			} else {
+				$chain = NULL;
 			}
+			while ($chain && $chain->key == $upd['key']) $chain = isset($chain->transferchain) ? self::Decode($chain->transferchain) : NULL;
+			if ($chain && $chain->Verify() && $chain->serial >= time() - 365*24*60*60) $upd['transferchain'] = $chain->updatemessage;
 		}
-		if (isset($upd['transfer'])) {
-			if (isset($upd['transferchain'])) {
-				$chain = self::Decode($upd['transferchain']);
-				while ($chain && $chain->key == $upd['key']) $chain = ($chain->Verify() && $chain->serial >= time() - 365*24*60*60 && isset($chain->transferchain)) ? self::Decode($chain->transferchain) : NULL;
-				if ($chain && $chain->Verify() && $chain->serial >= time() - 365*24*60*60) $upd['transferchain'] = $chain->updatemessage; else unset($upd['transferchain']);
-			}
-			if (isset($upd['value']) && !is_null($upd['value'])) {
-				$chain = array('label' => $upd['label'], 'serial' => $upd['serial'], 'key' => $upd['key'], 'transfer' => $upd['transfer']);
-				if (isset($upd['expiration'])) $chain['expiration'] = $upd['expiration'];
-				if (isset($upd['transferchain'])) $chain['transferchain'] = $upd['transferchain'];
-				$chain = self::Create($chain, $seckey);
-				if ($chain && strlen($chain->updatemessage) <= 0xffff) $upd['transferchain'] = $chain->updatemessage;
-			}
+		if (isset($upd['transfer']) && isset($upd['value']) && !is_null($upd['value'])) {
+			$chain = array('label' => $upd['label'], 'serial' => $upd['serial'], 'key' => $upd['key'], 'transfer' => $upd['transfer']);
+			if (isset($upd['expiration'])) $chain['expiration'] = $upd['expiration'];
+			if (isset($upd['transferchain'])) $chain['transferchain'] = $upd['transferchain'];
+			$chain = self::Create($chain, $seckey);
+			if ($chain && strlen($chain->updatemessage) <= 0xffff) $upd['transferchain'] = $chain->updatemessage;
 		}
 		$data = marc_encode_int32be($upd['serial']);
 		$data .= chr(strlen($upd['label'])).$upd['label'];
@@ -133,7 +130,7 @@
 			if (strlen($item) > 0xffff) throw new Exception('Extension data too big');
 			$data .= chr($identifier).marc_encode_int16be(strlen($item)).$item;
 		}
-		if (isset($upd['value'])) $data .= self::EncodeValue($upd['value']);
+		$data .= self::EncodeValue(isset($upd['value']) ? $upd['value'] : NULL);
 		$data = nacl_crypto_sign_ed25519($data, $seckey);
 		if (!strlen($data)) throw new Exception('Failed to sign data');
 		if (!strlen(nacl_crypto_sign_ed25519_open($data, $upd['key']))) throw new Exception('Key pair is not valid');