review fixes #5