makefile and little tweaks