Several enhancements on documentation