Various minor changes to controller
More tweaks and improvements to prototype controller