fixing some of the easier issues from the review