More animation fixes. Still not quite there yet.