yml check
yml fixes
deleted duplicates
claudina's changes