added minor enhancements