Numerous new features... code cleanup.