minor tweaks to a larger environment