Some more changes to the local_planner