Changed so to connect on start up and fixed disconnect/reconnect