Update documentation and misc enhancements
Update documentation