fix some minor bugs
Merge branch 'develop'