avatars added and a bunch of other stuff