Improving The Safety And Efficiency Of Next-Generation Liquid And Solid-State Lithium Batteries