Added particles, fixed a few conflicts.