Fixed various animation bugs