Clean up SS shapiro code; add calcs for planets.