Particles added, old stuff fixed
merge