paar weitere bugfixes
Merge branch 'bugfixes_general' into development