clarified some terms and cleaned up wiring