Fixed collision and animations