a few minor tweaks...