go with the 'eGo Mega Dual Coil Cartomizer' as stated above.... i did that and noticed better performance...as far as controlling the leak, each unit is different, mine leaked..it irked me so much i started looking at tanks.
you have good batteries now, if your anything like me, the leaking will get to you..now i only use the batteries and charger that came with my original kit..lol