bug fixes and enhancements.