CalvinIS (Illumn.com) has a specials page that I periodically check on.
At the moment it looks like all sorts of stuff. They now also carry the complete line of Xtar chargers at what seem to be good prices to me and have Olight 14500 and 16340 batteries at a good price. I believe, but do not hold me to it please, that the Olight batteries use Seiko protection
I do a lot of business with calvinis and illumn.com. Really good seller and very easy to work with. Highly recommended. I’ve bought several things myself off of that specials page in the past few months.
Calvin & Illumn (was Illumination Supply) are always a pleasure to buy from & deal with. 
Pity he rarely visits BLF now. 
I would be lost without these folks. Our USA dealers are priceless .
TL
Posted a reply meant for another forum here- my bad!
Phil
You aren't kidding!