various minor enhancements