MNT : changed names of some variables, doc typos