Fixed yaml error. Further changes.