diff --git a/src/Config.cpp b/src/Config.cpp
index 1e3f862cc9..3b40d38c69 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -7,6 +7,7 @@
 #include <fstream>
 #include <boost/lexical_cast.hpp>
 
+// Fees are in XNS raw.
 #define	DEFAULT_FEE_CREATE				1000
 #define	DEFAULT_FEE_DEFAULT				100
 
@@ -121,15 +122,6 @@ void Config::load()
 				FEE_DEFAULT = boost::lexical_cast<int>(strTemp);
 		}
 	}
-
-	/*
-	node=root.child("DB_TYPE");
-	if(!node.empty())
-	{
-		if( stricmp(node.child_value(),"mysql")==0 ) theApp->setDB(Database::newMysqlDatabase("host","user","pass"));
-		else theApp->setSerializer(new DiskSerializer());
-	}else */
-
 }
 
 // vim:ts=4
diff --git a/src/Config.h b/src/Config.h
index 4c43466e71..c5aadc6091 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -2,11 +2,14 @@
 #define __CONFIG__
 
 #include "types.h"
+#include "SerializedTypes.h"
 
 #include <string>
 
-#define SYSTEM_NAME		"newcoin"
-#define VALIDATORS_SITE		"redstem.com"
+#define SYSTEM_NAME		    "newcoin"
+#define VALIDATORS_SITE		    "redstem.com"
+#define SYSTEM_CURRENCY_CODE	    "XNS"
+#define SYSTEM_CURRENCY_PRECISION   6
 
 #define VALIDATORS_FILE_NAME	"validators.txt"
 const int SYSTEM_PEER_PORT = 6561;
@@ -26,47 +29,49 @@ const int SYSTEM_PEER_PORT = 6561;
 class Config
 {
 public:
-	// core software parameters
-	int VERSION;
+	// Core software parameters
+	int	    VERSION;
 	std::string VERSION_STR;
 
-	// network parameters
-	int NETWORK_START_TIME;		// The Unix time we start ledger 0
-	int TRANSACTION_FEE_BASE;
-	int LEDGER_SECONDS;
-	int LEDGER_PROPOSAL_DELAY_SECONDS;
-	int LEDGER_AVALANCHE_SECONDS;
+	// Network parameters
+	int	    NETWORK_START_TIME;		// The Unix time we start ledger 0
+	int	    TRANSACTION_FEE_BASE;
+	int	    LEDGER_SECONDS;
+	int	    LEDGER_PROPOSAL_DELAY_SECONDS;
+	int	    LEDGER_AVALANCHE_SECONDS;
 
 	// Note: The following parameters do not relate to the UNL or trust at all
-	int NETWORK_QUORUM;			// Minimum number of nodes to consider the network present
-	int VALIDATION_QUORUM;		// Minimum validations to consider ledger authoritative
+	int	    NETWORK_QUORUM;		// Minimum number of nodes to consider the network present
+	int	    VALIDATION_QUORUM;		// Minimum validations to consider ledger authoritative
 
-	// node networking parameters
+	// Peer networking parameters
 	std::string PEER_IP;
-	int PEER_PORT;
-	int NUMBER_CONNECTIONS;
-//	bool NODE_INBOUND;		// we accept inbound connections
-//	bool NODE_DATABASE;		// we offer historical data services
-//	bool NODE_PUBLIC;		// we do not attempt to hide our identity
-//	bool NODE_DUMB;			// we are a 'dumb' client
-//	bool NODE_SMART;		// we offer services to 'dumb' clients
-
-	// RPC parameters
-	std::string RPC_IP;
-	int RPC_PORT;
-	std::string RPC_USER;
-	std::string RPC_PASSWORD;
-
-	std::string VALIDATION_PASSWORD;
-	std::string VALIDATION_KEY;
-
+	int	    PEER_PORT;
+	int	    NUMBER_CONNECTIONS;
 	std::string PEER_SSL_CIPHER_LIST;
 	int	    PEER_SCAN_INTERVAL_MIN;
 	int	    PEER_START_MAX;
 	int	    PEER_CONNECT_LOW_WATER;
 
-	uint64	    FEE_CREATE;		// Fee to create an account
-	uint64	    FEE_DEFAULT;	// Default fee.
+//	bool	    NODE_INBOUND;		// We accept inbound connections
+//	bool	    NODE_DATABASE;		// We offer historical data services
+//	bool	    NODE_PUBLIC;		// We do not attempt to hide our identity
+//	bool	    NODE_DUMB;			// We are a 'dumb' client
+//	bool	    NODE_SMART;			// We offer services to 'dumb' clients
+
+	// RPC parameters
+	std::string RPC_IP;
+	int	    RPC_PORT;
+	std::string RPC_USER;
+	std::string RPC_PASSWORD;
+
+	// Validation
+	std::string VALIDATION_PASSWORD;
+	std::string VALIDATION_KEY;
+
+	// Fees
+	STAmount    FEE_CREATE;			// Fee to create an account
+	STAmount    FEE_DEFAULT;		// Default fee.
 
 	// configuration parameters
 	std::string DATA_DIR;