add lumi uncertainty, clean up naming of variables