small bugfixes
Merge branch 'entw'
small bugfixes
Merge branch 'entw'