Minor additions to controller and script