a few minor tweaks