Bubble UB + infect
minor tweaks/typos