making some minor tweaks