I am looking at the Samsung 18650-25r but not sure where is a good place to buy them that isnt expensive....or should i go with a different battery for the IPV D2? i was given two batteries,but i want to get a couple more as last night i upended the tank all over my device. I cleaned it up,and there was a small bubble under one of the batteries. seems to be charging fine so far.