Modifications to Makefile and init scripts detailed in previous commit msg.