Server update

New wss setup & a few minor bug fixes on the server side