additional minor improvements