some controller fixes