Multiple minor tweaks.

:-)