Updated makefile and server