makefile and init changes