refactoring
cleanups, tests ...
doc fixes, benchmark update