create email address when none is present
few changes to giving, added thank boolean
fixed conflict