new classes for z reco, small updates