updated config
and its usage in various files.