Added minor fixes, makefile