Fixed several YAML data issues
Merge pull request #62 from pjackson28/fixmoreyamlissues

Fixed several YAML data issues