V0.5 some small fixes
Merge branch 'entw'
V0.5 some small fixes