- some small fixes