Avatars work
Squashed some bugs