minor improvements framework files