Fix config references
Add more custom fields to data

This isn't good code. Still experimenting.
Use merged .yml and .md data