Added new ntuples, fixed ellipse etc.