fixed errors in client and server, should now be less errory