minus some FIXMEs; produce PDFs; cosmetic