Feature/more bubbles

Some missing fixes to.