review controller fixes