Makefile and init update