PJ: Minor presentation and makefile fixes