Replaced empty server, updated Makefile