applied patch
improving tests
more fixes