Enhancements and code fixes.