more tests, more fixes. v1.0.0