Fix edge case and add PostScript output