Fixed bugs caused my last commit

YAML should be clean and easy to use now