Cleanup
Update contributors
Overspill/ricochet has not been changed