Added Client and Host to the makefile, and fixed compile errors