Mo' debugging, fix makefile output