Modifications to "bubble".
Fixed "bubble".
Minor: Removed some dead code.