Their is a $10 trillion energy market in play and capital is pouring in to improve renewable energy. Wind solar and grid battery fast growth due to cost advantage over fossil fuel.
As to EV there is a massive investment in battery technology. The pace is basically 18% cost reduction on average. Some battery technology like LFP boosted unit sales. Li Sulur 3D graphene is likely to repeat that boost with 3X the range and half the price.
https://medium.com/areas-producers/ev-dreams-your-money-honey-7e489d8cd2f5
https://medium.com/areas-producers/ev-dreams-90-yield-52544c481a87