minor fixes to controller innards