makefile and service updates