Particles, minor fixes