Bubbles code minor changes