Spelling fixes

DB testing and spelling fixes
Merge branch 'tb-giveaway' into staging