added NameofT1DPerson back since it got lost; fixed null now