small fixes
more fixes