more fixes and tests, more stable now