More wiring today

More wiring today and a few more odds and ends.