minor tweaks

further minor tweaks