more tweaks to constraints