Included all updates for latest ntuples; almost ready to go