Misc fixes for new hardware. WIP.
software changes, still WIP
Update circuit to new design
Merge branch 'circuit'