minor enhancements and doc updates