Particle changes, gravity names and minor fixes and helper methods