Lots of minor tweaks.
Merge.