Minor changes to controllerpackage