refactored bubble and tweaked settings