Numerous small enhancements.