timing issues fixed, but strange collision animation behavior introduced