fix typos
Merge branch 'smashz-devel' into devel