Some client modifications, makefile updated.