diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp
index 5126bbd4fa..e9e71b2192 100644
--- a/src/TransactionEngine.cpp
+++ b/src/TransactionEngine.cpp
@@ -473,7 +473,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
 				{
 					std::cerr << "applyTransaction: Source is an unclaimed account." << std::endl;
 
-					result	= tenUNCLAIMED;
+					result	= terUNCLAIMED;
 				}
 				break;
 		}
@@ -514,9 +514,9 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
 				// Verify the transaction's signing public key is the key authorized for signing.
 				if (naSigningPubKey.getAccountID() != sleSrc->getIValueFieldAccount(sfAuthorizedKey).getAccountID())
 				{
-					std::cerr << "applyTransaction: Not authorized to use account." << std::endl;
+					std::cerr << "applyTransaction: Delay: Not authorized to use account." << std::endl;
 
-					result	= tenBAD_AUTH;
+					result	= terBAD_AUTH;
 				}
 				break;
 		}
@@ -651,7 +651,6 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
 
 	if (terSUCCESS == result)
 	{ // Write back the account states and add the transaction to the ledger
-		// WRITEME: Special case code for changing transaction key
 		for (std::vector<AffectedAccount>::iterator it = accounts.begin(), end = accounts.end();
 			it != end; ++it)
 		{
diff --git a/src/TransactionEngine.h b/src/TransactionEngine.h
index 75b79aca07..87aec83de0 100644
--- a/src/TransactionEngine.h
+++ b/src/TransactionEngine.h
@@ -24,9 +24,7 @@ enum TransactionEngineResult
 	tenBAD_SET_ID,			// Malformed.
 
 	// Invalid: Ledger won't allow.
-	tenUNCLAIMED	= -200,	// Can not use an unclaimed account.
-	tenCLAIMED,				// Can not claim a previously claimed account.
-	tenBAD_AUTH,			// Transaction's public key is not authorized.
+	tenCLAIMED		= -200,	// Can not claim a previously claimed account.
 	tenCREATED,				// Can't add an already created account.
 	tenMSG_SET,				// Can't change a message key.
 
@@ -60,6 +58,8 @@ enum TransactionEngineResult
 	terNO_LINE_NO_ZERO,		// Can't zero non-existant line, destination might make it.
 	terSET_MISSING_DST,		// Can't set password, destination missing.
 	terFUNDS_SPENT,			// Can't set password, password set funds already spent.
+	terUNCLAIMED,			// Can not use an unclaimed account.
+	terBAD_AUTH,			// Transaction's public key is not authorized.
 };
 
 enum TransactionEngineParams