fixes based on the feedback