Reinitialization after soft scattering, bug fixes in the calculation of angle and...