Changes to the Makefile, little code improvements.