So Fraser I am not alone in the flashaholic world.
I have numerous Fenix lights with my favourite being the TK11R2, T1, P2D and the LOD (I have 4 x LOD's they are my favourite AAA). I really like the RCR123 and RC123 batts in the tactical lights but they are not all that cheap here in Aust (hence US or HK purchase) and I do NOT recommend Lithium or Lithium Ion batts to NON Enthusiasts as they can create a whole can of worms for people who do no understand the idiosyncrasy's with recharging etc etc. (can be dangerous for the non educated). I am now moving into 18500 and 18650 batts for my "serious" lighting requirements (I have a M30 O'light on the way

)
Battery Junction is one of several US companies I purchase from.
Lighthound I have also found the best to deal with for international customers.
BE WARNED Australia Post is cracking down on importation of Lithium Batts
(someones laptop during transit).
Fraser/Utemad If you frequent the CPF forums you must also be hooked like me (it is an addiction).
Utemad good point but it is cheaper for me to rebuild a single 2AA mag for and existing owner with LED upgrade than purchase a new one ex USA. Most rebuilds I use 1 watt LED conversion because this best suits the users need (sufficient light with long run time, a 3 watt LED is not significantly more expensive but reduces run time) Unless you are purchasing significant quantity of gear from the US the cost of a single LED 2 or 3 AA maglite it is cheaper to rebuild, plus with all my rebuilds I include a TerraLux Mini Star2 LED, quality glass lens and include all new switch gear and use correct lubricants on new o-rings and electrical connections & metal threads to reduce water ingress, enhance thread wear/seal and electrical connectivity (new maglites are NOT supplied that way, hence I am always repairing due to corrosion, water ingress, lack of maintenance or leaky batts). If someone does not have a old 2AA to start with then yes it is cheaper to purchase a complete unit. Mind you I have still had a couple of new LED maglites land on my bench to be upgraded/overhauled and made "soldier proof".
Ref your purchase of the LED upgrade for your 4D mag, there are several nite ize upgrades available if you purchased the regular PR 1 watt type upgrade then you would not have seen much of an improvement in performance (but a extended run time of about 40 - 50 hrs which is what some users required) these upgrades are not ideally suited to 4+D units.
Mind you I have fitted one of those upgrades to an old Fulton Army 90 degree angle torch and it is ideal for that (50-60 hours run time of 2D's)
For D'Cell Mag-lites I use and recommend for most users the TerraLux Ministar5 for 2-6D (different models for 2-3 cell and 4-6 cell) and if someone is really serious I fit the TerraLux TLE-300. (There are other brighter custom bits available, one is only limited by $$$$ and a bit of tech savvy!)
I am thinking a separate thread about illumination (and maintenance) may be required but for those of you who think you know something about lighting be warned if you venture onto the CPF forum (how little I did know).
Thommo
Bookmarks