Minor improvements to yaml and doc