more makefiles
misc tweaks