More review fixes up to 42 minute mark.