Fixes and particle optimization