diff --git a/src/collision/collision_util.f90 b/src/collision/collision_util.f90
index ef582ee10..9573c1452 100644
--- a/src/collision/collision_util.f90
+++ b/src/collision/collision_util.f90
@@ -453,12 +453,13 @@ module subroutine collision_util_set_coordinate_collider(self)
 
          fragments%rmag(:) = .mag. fragments%rc(:,:)
          fragments%vmag(:) = .mag. fragments%vc(:,:)
+         fragments%rotmag(:) = .mag. fragments%rot(:,:)
   
          ! Define the radial, normal, and tangential unit vectors for each individual fragment
          fragments%r_unit(:,:) = .unit. fragments%rc(:,:) 
          fragments%v_unit(:,:) = .unit. fragments%vc(:,:) 
          fragments%n_unit(:,:) = .unit. (fragments%rc(:,:) .cross. fragments%vc(:,:))
-         fragments%t_unit(:,:) = .unit. (fragments%r_unit(:,:) .cross. fragments%r_unit(:,:))
+         fragments%t_unit(:,:) = .unit. (fragments%r_unit(:,:) .cross. fragments%n_unit(:,:))
 
       end associate
 
diff --git a/src/fraggle/fraggle_generate.f90 b/src/fraggle/fraggle_generate.f90
index c5b435fb5..6baa4b3fa 100644
--- a/src/fraggle/fraggle_generate.f90
+++ b/src/fraggle/fraggle_generate.f90
@@ -430,14 +430,14 @@ module subroutine fraggle_generate_vel_vec(collider)
       ! Arguments
       class(collision_fraggle), intent(inout) :: collider !! Fraggle collision system object
       ! Internals
-      integer(I4B) :: i, j, loop, istart, n, ndof
+      integer(I4B) :: i, j, loop, istart, iend, n, ndof
       logical :: lhitandrun, lnoncat
       real(DP), dimension(NDIM) :: vimp_unit, rimp, vrot, Lresidual
       real(DP) :: vmag, vesc, rotmag, ke_residual, ke_per_dof, ke_tot
       integer(I4B), dimension(collider%fragments%nbody) :: vsign
       real(DP), dimension(collider%fragments%nbody) :: vscale, mass_vscale, ke_avail
       integer(I4B), parameter :: MAXLOOP = 100
-      real(DP), parameter :: TOL = 1e-4
+      real(DP), parameter :: TOL = 1e-1
 
       associate(fragments => collider%fragments, impactors => collider%impactors, nfrag => collider%fragments%nbody)
          lhitandrun = (impactors%regime == COLLRESOLVE_REGIME_HIT_AND_RUN) 
@@ -501,13 +501,14 @@ module subroutine fraggle_generate_vel_vec(collider)
             call collider%set_coordinate_system()
             call fragments%get_kinetic_energy()
             ke_residual = fragments%ke_budget - (fragments%ke_orbit + fragments%ke_spin)
-            if (abs(ke_residual) <= fragments%ke_budget * TOL) exit
+            if (ke_residual > 0.0_DP) exit
             ! Make sure we don't take away too much orbital kinetic energy, otherwise the fragment can't escape
             ke_avail(:) = fragments%ke_orbit_frag(:) - impactors%Gmass(1)*impactors%mass(2)/fragments%rmag(:)
             ke_tot = 0.0_DP
             ke_per_dof = -ke_residual
             do i = 1, 2*(nfrag - istart + 1)
-               n = count(ke_avail(istart:nfrag) > -ke_residual/i) + count(fragments%ke_spin_frag(istart:nfrag) > -ke_residual/i)
+               n = count(ke_avail(istart:nfrag) > -ke_residual/i) 
+               if (ke_residual < 0.0_DP) n = n + count(fragments%ke_spin_frag(istart:nfrag) > -ke_residual/i)
                if (abs(n * ke_per_dof) > ke_tot) then
                   ke_per_dof = -ke_residual/i
                   ke_tot = n * ke_per_dof
@@ -528,7 +529,7 @@ module subroutine fraggle_generate_vel_vec(collider)
                rotmag = fragments%rotmag(i)**2 - 2*ke_per_dof/(fragments%mass(i) * fragments%radius(i)**2 * fragments%Ip(3,i))
                rotmag = max(rotmag, 0.0_DP)
                fragments%rotmag(i) = sqrt(rotmag)
-               fragments%rot(:,i) = rotmag * .unit.fragments%rot(:,i)
+               fragments%rot(:,i) = fragments%rotmag(i) * .unit.fragments%rot(:,i)
             end do
 
             ! Check for any residual angular momentum, and if there is any, put it into spin