diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,4 +1,3 @@
-^src/__pycache__/
+/__pycache__/
 ^\..*
-^temp/.*
 ^certs/
diff --git a/src/client.py b/src/client.py
--- a/src/client.py
+++ b/src/client.py
@@ -1,3 +1,4 @@
+import sys
 import collections
 import socket
 import ssl
@@ -21,7 +22,11 @@ class Connection(BaseConnection):
 		sslContext.load_cert_chain(conf.certfile,conf.keyfile)
 
 		self._socket=sslContext.wrap_socket(sock)
-		self._socket.connect((conf.hosts[0], conf.port))
+		try:
+			self._socket.connect((conf.hosts[0], conf.port))
+		except ConnectionRefusedError:
+			print("Couldn't connect to {0}".format(conf.hosts[0]))
+			sys.exit(1)
 
 		self.createNetworkers()
 
diff --git a/src/morevna.py b/src/morevna.py
--- a/src/morevna.py
+++ b/src/morevna.py
@@ -77,7 +77,7 @@ pBuild.set_defaults(func=buildTree)
 
 pUpdate=subparsers.add_parser("push")
 pUpdate.add_argument("-p","--port",type=int)
-pUpdate.add_argument("--host",default="127.0.0.1")
+pUpdate.add_argument("--host")
 pUpdate.add_argument("-t","--tree",help="stored hash tree location")
 pUpdate.add_argument("datafile")
 pUpdate.set_defaults(func=push)
@@ -91,7 +91,7 @@ pUpdate.set_defaults(func=pull)
 
 pServe=subparsers.add_parser("serve")
 pServe.add_argument("-p","--port",type=int)
-pServe.add_argument("--host",default="")
+pServe.add_argument("--host")
 pServe.add_argument("-t","--tree",help="stored hash tree location")
 pServe.add_argument("datafile")
 pServe.set_defaults(func=serve)
diff --git a/src/morevna.sh b/src/morevna.sh
--- a/src/morevna.sh
+++ b/src/morevna.sh
@@ -1,7 +1,11 @@
+# setup encrypted container
 #sudo losetup -f ext2.img
 #sudo cryptsetup open --type=luks /dev/loop0 ext2luks
 #sudo mkfs.ext2 /dev/mapper/ext2luks
 
+# generate certificate
+# openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes -subj "/CN=name"
+
 sudo losetup -f ~/ext2.img
 sudo cryptsetup open --type=luks /dev/loop0 ext2luks
 sudo mount /dev/mapper/ext2luks ~/temp
@@ -14,4 +18,5 @@ sudo umount /dev/mapper/ext2luks
 sudo cryptsetup close ext2luks
 sudo losetup -d /dev/loop0
 
-python morevna.py push --host 10.0.0.33 ~/ext2.img
+python morevna.py build ~/ext2.bin ~/ext2.img
+python morevna.py push --host 10.0.0.33 --tree ~/ext2.bin ~/ext2.img