minor enhancements
merge