random small fixes
some small fixes