fixed minor bugs
Merge branch 'develop' into liveSystem