cleanup
most things cleaned up and looking good...need more gates and
optimization (...except colors look a bit strange on colored cable, need
to swap values around?)