More tweaks and improvements to the prototype controller. More or less in a functional state for demoing now.