Enhancements and bug fixes.