LOTS of updates for new ntuples