Added Disconnect, improvements