review changes
Merge pull request #1907 from devoncarew/devoncarew_fixes

review changes