Further doc enhancements