ENHANCED MODELS FOR WIND SOLAR POWER GENERATION AND BATTERY ENERGY