docs & small enhancements