Tidy up connection logic and use patched reconnect fork FOR NOW!