made some more changes to App and ControlPlan