Updated solar calculations in Morrison, other changes