Particles work a bit  better

Needs to debug the strange stream of odd particles
clean code more