Fixed collision and animate bugs