A batcher-fix, and improved particles.