attempted fixes in server and client
Merge branch 'master' of https://github.com/tylerlitrel/cs-3251