Some fixes, added links to YAML