Collisions, fixed animation switch bug