- Some docs and enhancements