Fixed bug in weights for non-batch jobs, updated plots/table to new ntuples