Add config options and files
Remove printing of config