Particles, refactoring, and fixed some bugs!