various small fixes
minor fixes
minor fixes