avatars! code cleanup! lots of cool things!