minor improvements to UT