Improve the doc's examples
Fix doc references