Update validStart and validEnd

Be a little more conservative regarding wobble for now.