Add propper client initialization
Minor comment fixes in server
Minor bugfixes in connection
Remove some dead code