rewrite of controller actions from .11 -- tightens up implementation
mainly