- some minor fixes