Add config manager + other fixes