Added MCweight + calo jets
Bug fixes in nvertex