misc enhancements