small improvements to several aspects of the planner