Make the makefile stuff work a bit better I hope.