diff --git a/apps/enclave/src/bigint.cpp b/apps/enclave/src/bigint.cpp
index ec66753574..df0328b0db 100644
--- a/apps/enclave/src/bigint.cpp
+++ b/apps/enclave/src/bigint.cpp
@@ -154,12 +154,14 @@ bool Bigint::operator>(const Bigint& rhs) const
 }
 
 /*
- * Xors another Bigint with this Bigint and puts the result in Bigint `result'
+ * Xors another Bigint with this Bigint and puts the result in Bigint `result'.
+ * We can't name it "xor" because that word is reserved in C++ (see Appendex C,
+ * section 3.1 in TC++PL).
  *
  * rhs - the bigint to xor with
  * result - will be filled with the result of the xor
  */
-void Bigint::xor(const Bigint& rhs, Bigint& result) const
+void Bigint::x_or(const Bigint& rhs, Bigint& result) const
 {
 	int rc = mp_xor(const_cast<mp_int*>(&mpi), const_cast<mp_int*>(&rhs.mpi),
 		&result.mpi);
diff --git a/apps/enclave/src/bigint.hpp b/apps/enclave/src/bigint.hpp
index 76707e88aa..01694104eb 100644
--- a/apps/enclave/src/bigint.hpp
+++ b/apps/enclave/src/bigint.hpp
@@ -47,7 +47,7 @@ class Bigint {
 		Bigint& operator=(const Bigint& rhs);
 		bool operator==(const Bigint& rhs) const;
 		bool operator>(const Bigint& rhs) const;
-		void xor(const Bigint& rhs, Bigint& result) const;
+		void x_or(const Bigint& rhs, Bigint& result) const;
 
 	protected:
 		mp_int mpi;
@@ -57,4 +57,4 @@ class Bigint {
 		void init(void);
 };
 
-#endif  // BIGINT_HPP
\ No newline at end of file
+#endif  // BIGINT_HPP
diff --git a/apps/enclave/src/logger.hpp b/apps/enclave/src/logger.hpp
index e5c528d880..816cbc2aa3 100644
--- a/apps/enclave/src/logger.hpp
+++ b/apps/enclave/src/logger.hpp
@@ -39,17 +39,17 @@
  * LERROR - major, important errors
  */
 #if VERBOSE_LOGS
-	#define LDEBUG logger.set_pri(Logger::debug); logger << "(D)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << "(): "
-	#define LMINOR logger.set_pri(Logger::minor); logger << "(M)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << "(): "
-	#define LINFO  logger.set_pri(Logger::info);  logger << "(I)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << "(): "
-	#define LWARN  logger.set_pri(Logger::warn);  logger << "(W)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << "(): "
-	#define LERROR logger.set_pri(Logger::error); logger << "(E)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << "(): "
+	#define LDEBUG logger.set_pri(Logger::debug); logger << "(D)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << ": "
+	#define LMINOR logger.set_pri(Logger::minor); logger << "(M)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << ": "
+	#define LINFO  logger.set_pri(Logger::info);  logger << "(I)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << ": "
+	#define LWARN  logger.set_pri(Logger::warn);  logger << "(W)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << ": "
+	#define LERROR logger.set_pri(Logger::error); logger << "(E)" << __FILE__ << ':' << __LINE__ << ':' << __func__ << ": "
 #else
-	#define LDEBUG logger.set_pri(Logger::debug); logger
-	#define LMINOR logger.set_pri(Logger::minor); logger
-	#define LINFO  logger.set_pri(Logger::info);  logger
-	#define LWARN  logger.set_pri(Logger::warn);  logger
-	#define LERROR logger.set_pri(Logger::error); logger
+	#define LDEBUG logger.set_pri(Logger::debug); logger << "(D)"
+	#define LMINOR logger.set_pri(Logger::minor); logger << "(M)"
+	#define LINFO  logger.set_pri(Logger::info);  logger << "(I)"
+	#define LWARN  logger.set_pri(Logger::warn);  logger << "(W)"
+	#define LERROR logger.set_pri(Logger::error); logger << "(E)"
 #endif
 
 class Logger {
diff --git a/apps/enclave/src/main.cpp b/apps/enclave/src/main.cpp
index 807766295b..1791c6e8db 100644
--- a/apps/enclave/src/main.cpp
+++ b/apps/enclave/src/main.cpp
@@ -46,12 +46,16 @@ int main(int argc, char* argv[])
 
 	LINFO << "Enclave DHT - Built on " << __DATE__ << ' ' << __TIME__ << '\n';
 	try {
-		sam = new Sam("eldritch", 7656, argv[1], 0);
+		sam = new Sam("localhost", 7656, argv[1], 0);
 	} catch (const Sam_error& x) {
 		LERROR << "SAM error: " << x.what() << '\n';
-		if (x.code() == SAM_SOCKET_ERROR)
+		cerr << "SAM error: " << x.what() << '\n';
+		if (x.code() == SAM_SOCKET_ERROR) {
 			LERROR << "Check whether you have specified the correct SAM host " \
-				"and port number\n";
+				"and port number, and that\nI2P is running.\n";
+			cerr << "Check whether you have specified the correct SAM host " \
+				"and port number, and that\nI2P is running.\n";
+		}
 		return 1;
 	}
 	sam->naming_lookup();
diff --git a/apps/enclave/src/near_peer.hpp b/apps/enclave/src/near_peer.hpp
index bd433803b1..807726b3d5 100644
--- a/apps/enclave/src/near_peer.hpp
+++ b/apps/enclave/src/near_peer.hpp
@@ -51,4 +51,4 @@ class Near_peer {
 		Peer* peer;
 };
 
-#endif  // NEAR_PEER_HPP
\ No newline at end of file
+#endif  // NEAR_PEER_HPP
diff --git a/apps/enclave/src/peers.cpp b/apps/enclave/src/peers.cpp
index 707bd437d8..300a254e83 100644
--- a/apps/enclave/src/peers.cpp
+++ b/apps/enclave/src/peers.cpp
@@ -42,7 +42,8 @@ void Peers::advertise_self(void)
 {
 	list<Near_peer> near_peers;
 	get_nearest(sam->get_my_sha1(), PAR_RPCS, near_peers);
-	for (near_peers_ci i = near_peers.begin(); i != near_peers.end(); i++) {
+	for (list<Near_peer>::const_iterator i = near_peers.begin();
+			i != near_peers.end(); i++) {
 		Rpc rpc(i->get_peer());
 		rpc.find_peers(sam->get_my_sha1());
 	}
@@ -61,7 +62,7 @@ void Peers::get_nearest(const Sha1& sha1, size_t n,	list<Near_peer>& near_peers)
 	for (peersmap_i i = peersmap.begin(); i != peersmap.end(); i++) {
 		const Sha1& kaddr = i->first;
 		Bigint distance;
-		sha1.xor(kaddr, distance);
+		sha1.x_or(kaddr, distance);
 		Near_peer np(distance, &(i->second));
 		near_peers.insert(near_peers.end(), np);
 	}
@@ -211,7 +212,8 @@ void Peers::store(const Sha1& sha1)
 {
 	list<Near_peer> near_peers;
 	get_nearest(sam->get_my_sha1(), PAR_RPCS, near_peers);
-	for (near_peers_ci i = near_peers.begin(); i != near_peers.end(); i++) {
+	for (list<Near_peer>::const_iterator i = near_peers.begin();
+			i != near_peers.end(); i++) {
 		Rpc rpc(i->get_peer());
 		rpc.store(sha1);
 	}
diff --git a/apps/enclave/src/peers.hpp b/apps/enclave/src/peers.hpp
index c948a1968b..bf7cda3898 100644
--- a/apps/enclave/src/peers.hpp
+++ b/apps/enclave/src/peers.hpp
@@ -54,8 +54,6 @@ class Peers {
 	private:
 		typedef map<const Sha1, Peer>::const_iterator peersmap_ci;
 		typedef map<const Sha1, Peer>::iterator peersmap_i;
-		typedef list<Near_peer>::const_iterator near_peers_ci;
-		typedef list<Near_peer>::iterator near_peers_i;
 
 		void load(void);
 		void save(void);
diff --git a/apps/enclave/src/rpc.cpp b/apps/enclave/src/rpc.cpp
index 0cd2f502f7..736b29069b 100644
--- a/apps/enclave/src/rpc.cpp
+++ b/apps/enclave/src/rpc.cpp
@@ -80,8 +80,8 @@ void Rpc::found_peers(const Sha1& sha1)
 	p++;
 	*p = near_peers.size();
 	p++;
-	for (Peers::near_peers_ci i = near_peers.begin(); i != near_peers.end();
-			i++) {
+	for (list<Near_peer>::const_iterator i = near_peers.begin();
+			i != near_peers.end(); i++) {
 		const Peer* peer = i->get_peer();
 		memcpy(p, peer->get_dest().c_str(), (SAM_PUBKEY_LEN - 1));
 		p += SAM_PUBKEY_LEN - 1;
diff --git a/apps/enclave/src/sam_error.hpp b/apps/enclave/src/sam_error.hpp
index a37bfea40b..700d94737b 100644
--- a/apps/enclave/src/sam_error.hpp
+++ b/apps/enclave/src/sam_error.hpp
@@ -42,4 +42,4 @@ class Sam_error {
 		const samerr_t errcode;
 };
 
-#endif  // SAM_ERROR_HPP
\ No newline at end of file
+#endif  // SAM_ERROR_HPP
diff --git a/apps/enclave/src/sha1.cpp b/apps/enclave/src/sha1.cpp
index 48bbd8c934..db20ce19b2 100644
--- a/apps/enclave/src/sha1.cpp
+++ b/apps/enclave/src/sha1.cpp
@@ -114,9 +114,9 @@ bool Sha1::operator==(const Sha1& rhs) const
  * rhs - sha1 to xor this one with
  * result - will be filled with the result
  */
-void Sha1::xor(const Sha1& rhs, Bigint& result) const
+void Sha1::x_or(const Sha1& rhs, Bigint& result) const
 {
 	Bigint lhsnum(binhashed, SHA1BIN_LEN);
 	Bigint rhsnum(rhs.binhash(), SHA1BIN_LEN);
-	lhsnum.xor(rhsnum, result);
+	lhsnum.x_or(rhsnum, result);
 }
diff --git a/apps/enclave/src/sha1.hpp b/apps/enclave/src/sha1.hpp
index abef143b62..c997d1b8f6 100644
--- a/apps/enclave/src/sha1.hpp
+++ b/apps/enclave/src/sha1.hpp
@@ -43,7 +43,7 @@ class Sha1 {
 		bool operator<(const Sha1& rhs) const;
 		Sha1& operator=(const Sha1& rhs);
 		bool operator==(const Sha1& rhs) const;
-		void xor(const Sha1& rhs, Bigint& result) const;
+		void x_or(const Sha1& rhs, Bigint& result) const;
 
 	private:
 		void b64(void);
@@ -52,4 +52,4 @@ class Sha1 {
 		uchar_t binhashed[SHA1BIN_LEN];  // non-NUL terminated binary hash
 };
 
-#endif  // SHA1_HPP
\ No newline at end of file
+#endif  // SHA1_HPP