Added missing varibles, config break fix