Enhancements and fixes