Added DivePlan to role, and fixed DivePlanner errors