more fixes based on the feedback from -planning
more fixes based on the feedback from -planning