Numerous small enhancements