More checks and validation on gift codes
Fix typos in field names