More particles and code cleanup