made some minor fixes and changes to hopefully work with the server