Fix error in X11 forwarder when closing a connection; re-wrote to make it clearer and better close connections