- some more fixes