Fix typos
Fix wrong shells
Merge branch 'develop'