Changed YAML format, bugfixes.