minor enhancements