fixes based on the review