adding in some minor tweaks