Added geometry for avatar and bit of code cleanup.