Modification of the Makefile, and updates to the program core.