Fixed up some stuff.
Fixed up the avatar settings.
Did some work on some stuff.