Fixed reconnection etc :D