Fixed bugs
Applied new config, renamed old to origin