Various changes to schematic