Moved config to a dedicated object

plus some minor fixes + changes