Makefile, bugfixes, and improvements :D