Improved makefile + some minor corrections