Bunch of edits to GAMS nonlin least squares