Working more on bubble detection. Tweaks seem to be working ok, but will probably need a big paradigm shift to really do well. Pondering...