Equalize thermal/non thermal power separately, fix collector area calculations, prevent collectors from receiving more power than is available after rangeloss.