Replace ws on server with socket.io
Minor fixes and cleaning up
Replace ws with socket.io on client