Cleaned up a few things about server/client. Fixed a few errors in client. Added client to Makefile.