fix typos
Merge branch 'smashz-devel' into devel
Merge branch 'devel' into doc/overhaul