Change Name and Title.
Enhancements and Cleanup.