minor tweaks to Makefile, reorg and some syntax consistency changes