Schematic cleanup and PNG versions