small fixes
Merge branch 'develop' of https://github.com/Crowdcomputer/CC into develop