Some small fixes
Fix .avatar? blow up
Merge pull request #10 from bmneely/fix-a-few-things

Some small fixes