A quick point on the batteries were they something special, because the vast majority of them (even known branded) are manufactured IN china (look at your phone, pc, camera). Some use basic internal high quality cells manufactured in japan (and perhaps malay/singapore in offshore plants)
I vape and many forums tell us the better 18650 batteries, those which are ASSEMBLED in China using number of high quality "button" cells.