several controller fixes