minor tweaks...