tweaks to ensure better fits