Bubble particle effect + minor fixes