Added more scale factors, btagging uncertainties