Clean-up and add lumi. unc. syst.
Pulled locally.