small fixes
more fixes
small fix2
small fix3