Particles and a couple other changes