make file improvements and some over minor changes