Minor changes
Improved makefile