Minor fixes to makefile; pretty output;