documentation and minor enhancements