cleaning up the setup a little and adding TODOs for file based config