Some cleanup and more avatars.