Fixed some function comments and typos
Merge branch 'release' into core-pr-3