- some fixes