small fixes everiwhere