Enhancements and more