Schematic cleanup and PNG version