another review fixes