some fixes
small fixes