Particle/Weapon updates and small changes