Finished corrections on the avatar system