numerous enhancements