minor tweaks, none of them visible
FIGURE: Add figure.
MERGE: Annoying merge.