Improved makefile and service control script.