some of the review fixes