Wbiesing/bubble tweaks

this won't be merged in to the main branch but I wanted you to see the diff, @anbangx