makefile update & some tweaks