fix utf8
clean up yaml
remove _ in names
new files