Fix a couple kinks and make some yaml
YAML YAML YAML