Started fixing schematics