Fixed Twubble bubbles errors
Merge branch 'corbin-polishing-up-twubbles'
Merged in Twubbles fixes