contains various small fixes