states with transforming avatars
bugfixes, minor improvements
restructuring
minor fixes