more fixes (untested)
fix test