Implementing websockets
Few bug fixes