Fixing typos
Fixing more than typos.
Merge branch 'dev'