some more fixes and tests