Greatly improved the makefile.