code chore, fixes
small fixes