various fixes, enhancements, and updates