Cleanup and enhancements.