non-linear gmm: added some stuff, corrected typos