Some more minor tweaks.