Fixes several stuck particle bugs + small cleanup

I'm going to merge this because we need to release tonight. If you want to retroactively review this later, that would be good.