Improved Makefile: cleaned up, further testing and added some comments