Minor changes to server, can be used for handling various message types later