cleanup + added mt2bb and pseudojet multiplicity
Trying to fix conflicts