PII's MiG-21 Quest

I’ve taken it upon myself to fainally try and sort out the main variants of the MiG-21 (not including the Chinese stuff), and here’s what I’ve been able to sort through thus far. As many Russian aviation nuts as we have on this board, I assume that any mistakes I make will quickly be corrected. I’m just typing from memory because I want to see if I can remember this stuff without always consulting an online source. Here we go…

MiG-21F (Fishbed-B): First production variant with two NR-30 cannons, no AAM capability; three hardpoints total.
MiG-21F-13 (Fishbed-C): Deletion of one cannon with added Atoll-A capability; 3 hardpoints total.
MiG-21P (Fishbed-D): Deletion of all cannon but with much larger RP-21 radar; 3 hardpoints total.
MiG-21PF (Fishbed-E): Additional fuel capacity and capability to fire radar-guided Alkali AAM’s, but otherwise similar to MiG-21P; 3 hardpoints total.
MiG-21PFS (Fishbed-F): Uprated R-11 engine with addition of flap blowing (I think?) capability; 3 hardpoints total. (only a few built)
MiG-21PFM (Fishbed-F): Similar to MiG-21PFS, but with capability to fire AS-7 Kerry & Atoll/Alkali radar-guided missiles; capability to carry GP-9 cannon pod with GSh-23 gun in place of centerline hardpoint; 3 hardpoints total.
MiG-21FL (Fisbhed-F): HAL-produced MiG-21PFM for India.
MiG-21R (Fishbed-H): New variant outfitted for recce with additional hardpoints for underwing tanks (due to centerline being taken up by recce pod most of the time); first variant with five total hardpoints.
MiG-21RF (Fishbed-H): Export variant of MiG-21R.
MiG-21S (Fishbed-J): New fighter variant utilizing airframe of MiG-21R with five hardpoints plus new RP-22 radar.
MiG-21M (Fishbed-J): Export MiG-21S with new GSh-23L cannon allowing centerline fuel tank to be carried simultaneously with gun pack.
MiG-21SM (Fishbed-J): MiG-21S with more powerful R-13 engine & GSh-23L cannon
MiG-21MF (Fishbed-J): Export MiG-21SM
MiG-21SMT (Fishbed-K): Additional fuel in enlarged spine (not very many produced)
MiG-21bis (Fisbhed-L): New variant with R-25 engine and improved avionics plus capability to fire the R-60 AAM.
MiG-21bisN (Fishbed-L/N): Tactical nuclear weapons capability on centerline pylon.
MiG-21bis (Fishbed-N): Final variant with improved avionics over Fishbed-L

Whew! Okay guys, tell me where I went wrong (namely I don’t know the NATO designations for the MiG-21S series birds).