More timing fixes, coordinates in ephemerisben
Removed extraneous class definitions