minor tweaks.
More minor tweaks.