various small fixes.