Updated makefile and other stuff.