added formatting, minor controller fixes