upgraded modules. improved config loading