review fixes #2