tweaks for makefile and a few simplifications