Numerous enhancements and bug fixes.