fix some mistakes
Merge branch 'develop' into staging