various initial enhancements