Fixed pretty-print bug, added PNG output