Done with animation bug fix, all working now