miscellaneous enhancements and updates