massive update with numerous minor enhancements and bug fixes