Minor revisions to wiring