- reverted some changes from Makefile
- more makefile tweaks