Removed fluxcal; added rise/set times.