some minor enhancements