Public avatars now working, no more anon

Fixed up, seems to work fine, no big speed penalty as of yet.