Fixed the makefile, and made various other changes. Hello again, future :)