- some handling improvements