review fixes #4