comprehensibility fixes