Fixed Makefile and some other things