add reviews & refactor errors