- Update, fix bugs for Planner