tweaks to make setup clean