minor tweaks. here and there.