- some small tests and tweaks