More animation fixing, unfinished.