more controller fixes.