Solar Calculations Fixed