minor tweaks again