Fixes for Bubble Infinite Loop

This closes #45.