Repair particle logic, needs tweaking, closes #468