various enhancements and updates