more coverage
a bit more crunching
fix a couple of tests