review 1 fixes