Real Commit 1 - Many small updates.  Mostly fixed the leakage of particles as well as some other things I came across.
Merge pull request #6 from ebrox/Ed3

Real Commit 1 - Mostly fixed the leakage of particles...