Some changes to the makefile to aid in running.