Merge with Kyles changes and add missing config files