some small fixes
...