Fix comment typos.
Merge cleanup_and_small_fixes branch to develop.