enhancements, fixes and clean-up