a2 finished most of line->bar transition
removed a large TEMPORARY comment for a line that became permanent
merged something trivial