some more tests, cleanup
corrections