- some fixes and extensions