enhancements and fixes