more fixes based on the feedback from -planning