Update Readme and fixes for server