more fixes
more changes