added some tests, minor fixes
1.10.10