renamed some vars; fixed some occurences of 'LEPTON'; some other changes (use diff for details)