Fixed server and changed Makefile