Yeah, I need more batteries, then.
This is to everyone here who doesn't already know this, not just BionicDance.
I cannot stress enough the need to get your Li-ion batteries from a trusted source; right now, I'd recommend you get them from US directly. There are many (way too many) shysters out there claiming to sell brand-new, brand-name protected cells who have simply grabbed old batteries and re-wrapped them with someone else's branding, or who sell cheap, low-quality unprotected no-name cells as brand-name protected cells. US has a reliable supplier for a reliable brand of the batteries, so they are always a safe bet. Please, please, PLEASE don't fall into the trap of buying Li-ion batteries from someone you've never heard of just to save a couple dollars/euros/whatever, because low-quality or unprotected cells can catch fire or explode. It's not worth the savings.
Also, the type of charger matters greatly. Again, unless you already have a trusted supplier of Li-ion battery chargers, I recommend getting the charger from UltraSabers. This is another case where being cheap can easily translate directly to being unsafe.
And no, the Energizer charger you already have for your NiMH AA cells is not going to work on your Li-ion cells... and neither is your Eneloop charger.