Fix animation bug, and others