move more things into the config file
more protection against missing data