Real Commit 1 - Many small updates.  Mostly fixed the leakage of particles as well as some other things I came across.