Updating Schematic

Fixes #5
Fixes #26
Fixes #28