many major bugfixes
Merge branch 'develop'