Tweaks to rgen and initial point finding