Improvements

Still has dropped connections from client.