Lithium-ion and other batteries