Particle and apeshit fixes