One last update to yml files based on comments in parser review