Fixed bug in Makefile
Fixed minor bugs