minor improvements II