Some cleanup and working on client connection status