updated lots of stuff dealing with schematics