change to yaml, bugfixing