A bit more cleanup
Yaml cleanup
Take yaml file as an arugment, usage instructions otherwise

* Add rest of type signatures.