old cosmetic changes + Makefile update
merge