Fixes errors in comments.
Merge branch 'fix_comments' into devel