Added png to makefile
Various error/paging corrections