misc fixes
Merge branch 'master' of https://github.com/NathanCastle/Send-a-Smile.git