added few more server message handlers and refactored more