Updated Achievements and Avatar

Achievements updated and avatar stuff cleaned up.