More cleanup
Fixed bug where connecting would always fail