Some minor schematic work