enhancements and comments