added updated makefile and server_p