Added schematics and did some cleanup