code review corrections
code review errors fixed and errors_helper added