more controller fixes for class