controller, minor changes