some more tests and a few checks and tweaks