diff --git a/.github/workflows/github_actions_build.yml b/.github/workflows/github_actions_build.yml
index 09a14c20..53783353 100644
--- a/.github/workflows/github_actions_build.yml
+++ b/.github/workflows/github_actions_build.yml
@@ -56,12 +56,12 @@ jobs:
         make CLANG=Y VT=Y findorb.o
 
   buildWindows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@master
     - name: make
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
         mkdir myincl
 
         git clone https://github.com/Bill-Gray/lunar
@@ -86,11 +86,21 @@ jobs:
         copy jpleph.h ..\myincl
         cd ..
 
+        git clone https://github.com/Bill-Gray/PDCursesMod
+        cd PDCursesMod\wingui
+        set CL=/I"../myincl"
+        nmake UTF8=Y -f Makefile.vc
+        copy pdcurses.lib ..\..
+        copy ..\curses.h ..\..\myincl
+        cd ..\..
+
         set CL=/I"./myincl"
-        nmake -f dos_find.mak fo.exe cssfield.exe eph2tle.exe roottest.exe
+        nmake -f dos_find.mak fo.exe cssfield.exe eph2tle.exe roottest.exe find_orb.exe
 
         cl -W4 -Ox win_get.c urlmon.lib
-        win_get https://raw.githubusercontent.com/Bill-Gray/PDCursesMod/master/curses.h curses.h
-        nmake -f dos_find.mak findorb.obj
-
       shell: cmd
+    - name: Archive .EXEs
+      uses: actions/upload-artifact@v4
+      with:
+         name: exes
+         path: '*.exe'
diff --git a/Dockerfile b/Dockerfile
index de8c230c..6bfa78e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:latest
-MAINTAINER Bill Gray 
+MAINTAINER Bill Gray
 
 SHELL ["/bin/bash", "-c"]
 ENV PATH="${PATH}:~/bin"
@@ -7,7 +7,7 @@ ENV PATH="${PATH}:~/bin"
 # Update applications and install OS-level dependencies
 RUN apt-get update \
 	&& apt-get upgrade -y \
-	&& apt-get install g++ make wget libncurses5-dev libcurl4-openssl-dev git -y
+	&& apt-get install g++ make wget libncurses5-dev libcurl4-openssl-dev zlib1g-dev git -y
 
 # Download and install find_orb and dependencies
 RUN mkdir software && cd software \
diff --git a/ObsCodes.htm b/ObsCodes.htm
index 6a9df9af..3e083abf 100644
--- a/ObsCodes.htm
+++ b/ObsCodes.htm
@@ -33,7 +33,7 @@
 030  11.254460.723534+0.688012Arcetri Observatory, Florence
 031  11.189850.639061+0.766705Sonneberg
 032  11.582950.631624+0.772706Jena
-033  11.711240.630900+0.773333Karl Schwarzschild Observatory, Tautenburg
+033  11.711240.630904+0.773338Karl Schwarzschild Observatory, Tautenburg
 034  12.452460.745176+0.664656Monte Mario Observatory, Rome
 035  12.575920.565008+0.822321Copenhagen
 036  12.650400.747247+0.662420Castel Gandolfo
@@ -61,19 +61,19 @@
 058  20.4950 0.57897 +0.81262 Kaliningrad
 059  20.2201 0.65500 +0.75364 Lomnicky Stit
 060  21.4200 0.61572 +0.78535 Warsaw-Ostrowik
-061  22.298500.662142+0.746904Uzhgorod
+061  22.298500.662142+0.746904Uzhhorod
 062  22.2293 0.49440 +0.86632 Turku
 063  22.4450 0.49496 +0.86601 Turku-Tuorla
 064  22.7500 0.49489 +0.86605 Turku-Kevola
 065  12.6318 0.67222 +0.73800 Traunstein
 066  23.718170.789321+0.611946Athens
-067  24.0297 0.64632 +0.76058 Lvov University Observatory
-068  24.0142 0.64627 +0.76062 Lvov Polytechnic Institute
+067  24.0297 0.64632 +0.76058 Lviv University Observatory
+068  24.0142 0.64627 +0.76062 Lviv Polytechnic Institute
 069  24.4042 0.54925 +0.83287 Baldone
 070  25.2865 0.57940 +0.81233 Vilnius (before 1939)
 071  24.737820.74803 +0.66185 NAO Rozhen, Smolyan
 072   7.17   0.629   +0.774   Scheuren Observatory
-073  26.0967 0.71549 +0.69630 Bucharest
+073  26.093910.715515+0.696285Bucharest
 074  26.4058 0.87518 -0.48263 Boyden Observatory, Bloemfontein
 075  26.7216 0.52557 +0.84791 Tartu
 076  27.8768 0.90127 -0.43225 Johannesburg-Hartbeespoort
@@ -83,25 +83,25 @@
 080  28.9667 0.75566 +0.65278 Istanbul
 081  27.8768 0.90127 -0.43225 Leiden Station, Johannesburg
 082  15.7561 0.66929 +0.74063 St. Polten
-083  30.5056 0.63918 +0.76651 Golosseevo-Kiev
+083  30.5056 0.63918 +0.76651 Holosiivskyi district-Kyiv
 084  30.3274 0.50471 +0.86041 Pulkovo
-085  30.5023 0.63800 +0.76749 Kiev
-086  30.7582 0.68987 +0.72152 Odessa
+085  30.5023 0.63800 +0.76749 Kyiv
+086  30.7582 0.68987 +0.72152 Odesa
 087  31.3411 0.86799 +0.49495 Helwan
-088  31.8250 0.86741 +0.49608 Kottomia
-089  31.9747 0.68359 +0.72743 Nikolaev
+088  31.827690.867391+0.496114Kottomia
+089  31.9747 0.68359 +0.72743 Mykolaiv
 090   8.25   0.645   +0.762   Mainz
 091   4.209190.703630+0.708287Observatoire de Nurol, Aurec sur Loire
 092  18.5546 0.60177 +0.79601 Torun-Piwnice
 093  20.3647 0.3537  +0.9322  Skibotn
-094  33.9974 0.71565 +0.69620 Crimea-Simeis
-095  34.0160 0.71172 +0.70024 Crimea-Nauchnij
+094  33.9974 0.71565 +0.69620 Crimea-Simeiz
+095  34.0160 0.71172 +0.70024 Crimea-Nauchnyi
 096   9.4283 0.69967 +0.71215 Merate
 097  34.7625 0.86165 +0.50608 Wise Observatory, Mitzpeh Ramon
-098  11.569000.697916+0.714090Asiago Observatory, Cima Ekar
+098  11.569000.697916+0.714090Asiago Observatory, Cima Ekar, 182 cm Copernicus
 099  25.535290.484073+0.872114Lahti
 100  24.141450.461165+0.884370Ahtari
-101  36.2322 0.64403 +0.76246 Kharkov
+101  36.2322 0.64403 +0.76246 Kharkiv
 102  36.759530.564841+0.822468Zvenigorod
 103  14.527740.695365+0.716346Ljubljana
 104  10.803750.719842+0.692040San Marcello Pistoiese
@@ -121,16 +121,16 @@
 118  17.2740 0.66558 +0.74394 Astronomical and Geophysical Observatory, Modra
 119  42.8200 0.74731 +0.66262 Abastuman
 120  13.7261 0.70489 +0.70699 Visnjan
-121  36.934030.648856+0.758394Kharkov University, Chuguevskaya Station
+121  36.934030.648856+0.758394Kharkiv University, Chuhuivskyi district Station
 122   3.5035 0.72017 +0.69176 Pises Observatory
 123  44.2917 0.76352 +0.64398 Byurakan
 124   2.2550 0.72534 +0.68612 Castres
 125  44.789500.747594+0.662026Tbilisi
-126   9.7903 0.71893 +0.69283 Monte Viseggi
+126   9.790150.718943+0.692828Monte Viseggi L. Zannoni Observatory
 127   6.9797 0.63385 +0.77088 Bornheim
 128  46.006610.623279+0.779393Saratov
 129  45.92   0.777   +0.628   Ordubad
-130  10.239630.700143+0.711791Lumezzane
+130  10.239630.700148+0.711796Lumezzane
 131   4.725  0.7123  +0.6996  Observatoire de l'Ardeche
 132   5.2461 0.71919 +0.69260 Bedoin
 133   5.0906 0.72819 +0.68309 Les Tardieux
@@ -188,7 +188,7 @@
 185   7.4219 0.67876 +0.73200 Observatoire Astronomique Jurassien-Vicques
 186  66.8821 0.77679 +0.62781 Kitab
 187  17.0733 0.61314 +0.78735 Astronomical Observatory, Borowiec
-188  66.895550.782059+0.621762Majdanak
+188  66.895550.782059+0.621762Maidanak
 189   6.1514 0.69340 +0.71823 Geneva (before 1967)
 190  68.6819 0.78382 +0.61909 Gissar
 191  68.7811 0.78306 +0.62006 Dushanbe
@@ -199,17 +199,17 @@
 196   7.3331 0.65296 +0.75490 Homburg-Erbach
 197  12.1836 0.71739 +0.69434 Bastia
 198   8.756740.662195+0.746924Wildberg
-199   2.4380 0.66659 +0.74294 Buthiers
+199   2.4380 0.66659 +0.74294 Telescope Jean-Marc Salomon, Buthiers
 200   4.3036 0.63385 +0.77088 Beersel Hills Observatory
 201   7.6033 0.69871 +0.71332 Jonathan B. Postel Observatory
 202   5.8997 0.73137 +0.67971 Tamaris Observatoire, La Seyne sur Mer
-203   8.9955 0.70161 +0.71021 GiaGa Observatory
-204   8.7708 0.69765 +0.71430 Schiaparelli Observatory
+203   8.995480.701614+0.710215GiaGa Observatory
+204   8.769720.697648+0.714307Schiaparelli Observatory
 205  11.2731 0.71478 +0.69703 Obs. Casalecchio di Reno, Bologna
 206  10.5667 0.4922  +0.8677  Haagaar Observatory, Eina
 207   9.3065 0.70156 +0.71025 Osservatorio Antonio Grosso
 208   9.5875 0.70893 +0.70294 Rivalta
-209  11.568830.697904+0.714100Asiago Observatory, Cima Ekar-ADAS
+209  11.568830.697904+0.714100Asiago Observatory, Cima Ekar, 67/92 cm Schmidt
 210  76.9573 0.73042 +0.68104 Alma-Ata
 211  11.1764 0.72338 +0.68815 Scandicci
 212 355.357470.803253+0.593708Observatorio La Dehesilla
@@ -244,18 +244,18 @@
 241  13.4700 0.66465 +0.74474 Schaerding
 242   1.6956 0.72681 +0.68460 Varennes
 243   9.4130 0.59572 +0.80050 Umbrella Observatory, Fredenbeck
-244   0.000000.000000 0.000000Geocentric Occultation Observation
+244   0.000000.000000+0.000000Geocentric Occultation Observation
 245                           Spitzer Space Telescope
 246  14.284760.659216+0.749664Klet Observatory-KLENOT
 247                           Roving Observer
-248   0.000000.000000 0.000000Hipparcos
+248   0.000000.000000+0.000000Hipparcos
 249                           SOHO
 250                           Hubble Space Telescope
 251 293.246920.949577+0.312734Arecibo
 252 243.205120.817719+0.573979Goldstone DSS 13, Fort Irwin
 253 243.110470.815913+0.576510Goldstone DSS 14, Fort Irwin
 254 288.511280.736973+0.673692Haystack, Westford
-255  33.186890.705965+0.705886Evpatoria
+255  33.186890.705965+0.705886Yevpatoriya
 256 280.160170.784451+0.618320Green Bank
 257 243.124610.816796+0.575252Goldstone DSS 25, Fort Irwin
 258                           Gaia
@@ -263,11 +263,17 @@
 260 149.0661 0.85560 -0.51626 Siding Spring Observatory-DSS
 261 243.140220.836325+0.546877Palomar Mountain-DSS
 262 289.266260.873440-0.486052European Southern Observatory, La Silla-DSS
-266 204.523440.941701+0.337237New Horizons KBO Search-Subaru
-267 204.530440.941705+0.337234New Horizons KBO Search-CFHT
-268 289.308030.875516-0.482342New Horizons KBO Search-Magellan/Clay
-269 289.309140.875510-0.482349New Horizons KBO Search-Magellan/Baade
+263 148.981460.816176-0.576054Canberra DSS 35
+264 148.978540.816182-0.576043Canberra DSS 36
+265 148.981270.816109-0.576148Canberra DSS 43
+266 204.523960.941711+0.337239New Horizons KBO Search-Subaru
+267 204.531090.941717+0.337240New Horizons KBO Search-CFHT
+268 289.308030.875516-0.482342Magellan-Clay Telescope
+269 289.309140.875510-0.482349Magellan-Baade Telescope
 270                           Unistellar Network, Roving Observer
+271 149.550140.864051-0.501790ATCA, W196 reduction, DSS 47
+272 148.981960.816149-0.576092Canberra DSS 34
+273                           Euclid
 274                           James Webb Space Telescope
 275                           Non-geocentric Occultation Observation
 276  20.382790.608295+0.791076Plonsk
@@ -281,13 +287,16 @@
 284  15.8311 0.60536 +0.79329 Driesen
 285   2.3708 0.66135 +0.74759 Flammarion Observatory, Juvisy
 286 102.7883 0.90694 +0.42057 Yunnan Observatory
+287 133.809830.850085-0.524929Ceduna 30, UTAS
+288                           SPHEREx
+289                           Nancy Grace Roman Space Telescope
 290 250.107990.842743+0.537438Mt. Graham-VATT
 291 248.400240.849471+0.526470LPL/Spacewatch II
 292 285.1058 0.76630 +0.64033 Burlington, New Jersey
 293 285.5899 0.76936 +0.63668 Burlington remote site
 294 285.8467 0.76031 +0.64739 Astrophysical Obs., College of Staten Island
 295 283.0000 0.7789  +0.6251  Catholic University Observatory, Washington
-296 286.2515 0.7365  +0.6742  Dudley Observatory, Albany (after 1893)
+296 286.2200 0.73660 +0.67407 Dudley Observatory, Albany (after 1893)
 297 286.819  0.7203  +0.6913  Middlebury
 298 287.3408 0.74943 +0.65988 Van Vleck Observatory
 299 107.6160 0.99316 -0.11808 Bosscha Observatory, Lembang
@@ -295,10 +304,11 @@
 301 288.8467 0.70279 +0.70926 Mont Megantic
 302 288.88   0.990   +0.150   University of the Andes station
 303 289.1296 0.98890 +0.15185 OAN de Llano del Hato, Merida
-304 289.2980 0.87559 -0.48217 Las Campanas Observatory
+304 289.308580.875513-0.482346Las Campanas Observatory
 305 109.5514 0.82066 +0.56963 Purple Mountain, Hainan Island station
 306 290.6769 0.98477 +0.17381 Observatorio Taya Beixo, Barquisimeto
 307 287.7166 0.72410 +0.68743 Shattuck Observatory, Hanover
+308 138.362760.808792+0.586530Usuda Deep Space Center, 64-m, Nagano
 309 289.595690.909943-0.414336Cerro Paranal
 310 288.871640.739802+0.670574Minor Planet Center Test Code
 312 112.334  0.9574  +0.2877  Tsingtao field station, Xisha Islands
@@ -313,7 +323,11 @@
 330 118.8209 0.84828 +0.52788 Purple Mountain Observatory, Nanking
 333 249.5236 0.84936 +0.52642 Desert Eagle Observatory
 334 120.3196 0.80925 +0.58552 Tsingtao
-337 121.1843 0.85708 +0.51348 Sheshan, formerly Zo-Se
+335                           PUNCH
+336                           Lucy
+337 121.1843 0.85708 +0.51348 Sheshan
+338                           Psyche
+339                           Trace Gas Orbiter
 340 135.4853 0.82199 +0.56762 Toyonaka
 341 137.9486 0.80669 +0.58923 Akashina
 342 134.3189 0.83425 +0.54955 Shishikui
@@ -435,7 +449,7 @@
 458 355.9806 0.75992 +0.64805 Guadarrama Observatory
 459 288.1172 0.72607 +0.68538 Smith River Observatory, Danbury
 460 265.9981 0.83010 +0.55579 Area 52 Observatory, Nashville
-461  19.8943 0.67153 +0.73869 University of Szeged, Piszkesteto Stn. (Konkoly)
+461  19.893670.671543+0.738689University of Szeged, Piszkesteto Stn. (Konkoly)
 462 283.0842 0.77905 +0.62488 Mount Belleview Observatory
 463 254.7375 0.76726 +0.63959 Sommers-Bausch Observatory, Boulder
 464 288.5013 0.75109 +0.65799 Toby Point Observatory, Narragansett
@@ -450,7 +464,7 @@
 473  13.316610.694793+0.716822Remanzacco
 474 170.464960.720773-0.691079Mount John Observatory, Lake Tekapo
 475   7.6965 0.70747 +0.70443 Turin (before 1913)
-476   7.140750.706596+0.705358Grange Observatory, Bussoleno
+476   7.140740.706597+0.705359Grange Observatory, Bussoleno
 477   0.4856 0.62103 +0.78117 Galleywood
 478   3.0896 0.72548 +0.68597 Lamalou-les-Bains
 479   6.0505 0.73020 +0.68096 Sollies-Pont
@@ -474,7 +488,7 @@
 497 359.294490.622323+0.780160Loudwater
 498 359.2581 0.61334 +0.78718 Earls Barton
 499 359.790780.625578+0.777562Cheam
-500   0.000000.000000 0.000000Geocentric
+500   0.000000.000000+0.000000Geocentric
 501   0.3475 0.63237 +0.77208 Herstmonceux
 502   0.847930.618111+0.783475Colchester
 503   0.0948 0.61400 +0.78667 Cambridge
@@ -525,7 +539,7 @@
 548  13.3950 0.60999 +0.78976 Berlin (1835-1913)
 549  17.6257 0.50341 +0.86116 Uppsala
 550  11.4196 0.5943  +0.8015  Schwerin
-551  18.1895 0.67201 +0.73808 Hurbanovo, formerly O'Gyalla
+551  18.1895 0.67201 +0.73808 Hurbanovo
 552  11.3418 0.71485 +0.69700 Osservatorio S. Vittore, Bologna
 553  18.9938 0.64002 +0.76574 Chorzow
 554   8.3959 0.63684 +0.76845 Burgsolms Observatory, Wetzlar
@@ -535,7 +549,7 @@
 558  21.0303 0.61396 +0.78672 Warsaw
 559  14.98   0.793   +0.607   Serra La Nave
 560  10.931000.703262+0.708561Madonna di Dossobuono
-561  19.8943 0.67153 +0.73869 Piszkesteto Stn. (Konkoly)
+561  19.893670.671543+0.738689Piszkesteto Stn. (Konkoly)
 562  15.9236 0.66938 +0.74062 Figl Observatory, Vienna
 563  13.60   0.671   +0.739   Seewalchen
 564  11.19   0.671   +0.741   Herrsching
@@ -557,9 +571,9 @@
 580  15.4936 0.68242 +0.72862 Graz
 581  22.80   0.830   -0.556   Sedgefield
 582   1.2408 0.61682 +0.78447 Orwell Park
-583  30.2717 0.69087 +0.72056 Odessa-Mayaki
+583  30.2717 0.69087 +0.72056 Odesa-Mayaky
 584  30.2946 0.50213 +0.86189 Leningrad
-585  30.524620.640079+0.765763Kyiv comet station
+585  30.524620.640067+0.765748Kyiv comet station
 586   0.1423 0.73358 +0.67799 Pic du Midi
 587   9.229180.697459+0.714479Sormano
 588  11.25   0.715   +0.697   Eremo di Tizzano
@@ -667,7 +681,7 @@
 690 248.3367 0.81832 +0.57344 Lowell Observatory, Flagstaff
 691 248.399660.849466+0.526479Steward Observatory, Kitt Peak-Spacewatch
 692 249.0513 0.84679 +0.53036 Steward Observatory, Tucson
-693 249.267450.845317+0.533211Catalina Station, Tucson
+693 249.267450.845313+0.533209Catalina Station, Tucson
 694 248.9943 0.84700 +0.53009 Tumamoc Hill, Tucson
 695 248.405330.849504+0.526425Kitt Peak
 696 249.1154 0.85205 +0.52249 Whipple Observatory, Mt. Hopkins
@@ -677,7 +691,7 @@
 700 250.3817 0.80656 +0.58960 Chinle
 701 249.797160.853823+0.519224Junk Bond Observatory, Sierra Vista
 702 252.8117 0.8305  +0.5561  Joint Obs. for cometary research, Socorro
-703 249.267360.845315+0.533213Catalina Sky Survey
+703 249.267360.845311+0.533211University of Arizona Catalina Sky Survey
 704 253.340930.831869+0.553542Lincoln Laboratory ETS, New Mexico
 705 254.179420.841945+0.538563Apache Point
 706 253.9366 0.78294 +0.62043 Salida
@@ -708,7 +722,7 @@
 731 272.6711 0.77290 +0.63244 Rose-Hulman Observatory, Terre Haute
 732 263.2300 0.95591 +0.29359 Oaxaca
 733 263.3546 0.83802 +0.54387 Allen, Texas
-734 263.9986 0.77943 +0.62449 Farpoint Observatory, Eskridge
+734 263.997580.779425+0.624489Farpoint Observatory, Eskridge
 735 264.406400.872133+0.487634George Observatory, Needville
 736 263.3357 0.87006 +0.49132 Houston
 737 275.6633 0.8282  +0.5586  New Bullpen Observatory, Alpharetta
@@ -766,10 +780,10 @@
 789 284.5940 0.73188 +0.67922 Litchfield Observatory, Clinton
 790 284.2835 0.70343 +0.70840 Dominion Observatory, Ottawa
 791 284.5236 0.76713 +0.63937 Flower and Cook Observatory, Philadelphia
-792 288.30   0.753   +0.657   University of Rhode Island, Quonochontaug
-793 286.2200 0.73660 +0.67407 Dudley Observatory, Albany (before 1893)
+792 288.299050.751746+0.657236University of Rhode Island, Quonochontaug
+793 286.2515 0.7365  +0.6742  Dudley Observatory, Albany (before 1893)
 794 286.1100 0.74789 +0.66161 Vassar College Observatory, Poughkeepsie
-795 286.0123 0.7589  +0.6491  Rutherford
+795 286.038610.757969+0.650106Rutherford
 796 286.45   0.755   +0.654   Stamford
 797 287.0751 0.75218 +0.65676 Yale Observatory, New Haven
 798 287.0154 0.75093 +0.65822 Yale Observatory, Bethany
@@ -827,7 +841,7 @@
 850 274.0802 0.81810 +0.57333 Cordell-Lorenz Observatory, Sewanee
 851 296.419620.712830+0.698986Burke-Gaffney Observatory, Halifax
 852 269.4050 0.7805  +0.6231  River Moss Observatory, St. Peters
-853 249.1517 0.84365 +0.53544 Biosphere 2 Observatory
+853 249.153270.843603+0.535508Biosphere 2 Observatory
 854 249.179950.846183+0.531351Sabino Canyon Observatory, Tucson
 855 266.5383 0.7093  +0.7026  Wayside Observatory, Minnetonka
 856 242.5540 0.8300  +0.5560  Riverside
@@ -877,7 +891,7 @@
 900 135.989940.819572+0.571083Moriyama
 901 137.0877 0.81664 +0.57525 Tajimi
 902 132.2208 0.82775 +0.55922 Ootake
-903 135.1769 0.81738 +0.57418 Fukuchiyama and Kannabe
+903 135.174240.817354+0.574227Fukuchiyama and Kannabe
 904 135.12   0.824   +0.565   Go-Chome and Kobe-Suma
 905 135.9246 0.83368 +0.55040 Nachi-Katsuura Observatory
 906 145.667  0.8113  -0.5837  Cobram
@@ -906,7 +920,7 @@
 929 268.7758 0.86319 +0.50319 Port Allen
 930 210.412240.953752-0.299638S. S. Observatory, Pamatai
 931 210.3842 0.95330 -0.30100 Puna'auia
-932 286.573940.749771+0.659497John J. McCarthy Obs., New Milford
+932 286.574010.749767+0.659494John J. McCarthy Obs., New Milford
 933 249.7342 0.85383 +0.51924 Rockland Observatory, Sierra Vista
 934 242.9572 0.83985 +0.54108 Poway Valley
 935 282.3394 0.77977 +0.62400 Wyrick Observatory, Haymarket
@@ -932,7 +946,7 @@
 955 350.6739 0.78146 +0.62188 Sassoeiros
 956 356.1908 0.76224 +0.64530 Observatorio Pozuelo
 957 359.3506 0.71047 +0.70137 Merignac
-958 358.969610.724206+0.687273Observatoire de Dax
+958 358.969470.724214+0.687282Observatoire de Dax
 959   1.4653 0.72596 +0.68548 Ramonville Saint Agne
 960   0.6108 0.63016 +0.77387 Rolvenden
 961 356.8206 0.56112 +0.82498 City Observatory, Calton Hill, Edinburgh
@@ -944,11 +958,11 @@
 967 358.9778 0.61508 +0.78585 Greens Norton
 968   0.4250 0.6158  +0.7853  Haverhill
 969 359.8454 0.6235  +0.7792  London-Regents Park
-970   0.4954 0.62045 +0.78162 Chelmsford
+970   0.493480.620452+0.781632Chelmsford
 971 350.812490.781336+0.622040Lisbon
 972 357.5833 0.54359 +0.83656 Dun Echt
 973 359.6671 0.62271 +0.77983 Harrow
-974   8.9220 0.71542 +0.69637 Genoa
+974   8.844310.715243+0.696571Genoa Observatory
 975 359.6333 0.77292 +0.63239 Observatorio Astronomico de Valencia
 976 358.4669 0.61258 +0.78778 Leamington Spa
 977 351.5483 0.58660 +0.80717 Markree
@@ -960,10 +974,10 @@
 983 353.795250.805167+0.591067San Fernando
 984 357.269750.631671+0.772658Eastfield
 985 357.5317 0.60801 +0.79130 Telford
-986 358.75   0.624   +0.779   Ascot
+986 359.360530.625049+0.777992Ascot
 987 355.3735 0.58658 +0.80721 Isle of Man Observatory, Foxdale
 988 355.7060 0.56225 +0.82421 Glasgow
-989 357.69   0.600   +0.797   Wilfred Hall Observatory, Preston
+989 357.405820.591888+0.803341Wilfred Hall Observatory, Preston
 990 356.3121 0.76260 +0.64487 Madrid
 991 356.9278 0.59750 +0.79919 Liverpool (since 1867)
 992 356.9995 0.5973  +0.7993  Liverpool (before 1867)
@@ -987,11 +1001,11 @@
 A10   1.9281 0.75278 +0.65613 Observatorio Astronomico de Corbera
 A11   2.4718 0.63222 +0.77219 Wormhout
 A12   8.747680.703404+0.708434Stazione Astronomica di Sozzago
-A13   7.1394 0.68632 +0.72501 Observatoire Naef, Marly
+A13   7.1394 0.68632 +0.72501 Observatoire Naef, Ependes
 A14   5.1864 0.72028 +0.69143 Les Engarouines Observatory
 A15   6.7972 0.61903 +0.78275 Josef Bresser Sternwarte, Borken
 A16   7.1922 0.68622 +0.72511 Tentlingen
-A17   8.681520.650125+0.757317Guidestar Observatory, Weinheim
+A17   8.681470.650133+0.757328Guidestar Observatory, Weinheim
 A18   7.1761 0.62342 +0.77928 Herne
 A19   7.0744 0.63164 +0.77267 Koln
 A20   7.518870.605274+0.793357Sogel
@@ -1011,7 +1025,7 @@
 A34  10.7911 0.64944 +0.75793 Grosshabersdorf
 A35  12.8978 0.63511 +0.76995 Hormersdorf Observatory
 A36   9.7911 0.69856 +0.71340 Ganda di Aviatico
-A37  13.6634 0.61128 +0.78877 Mueggelheim
+A37  13.661580.611298+0.788754Mueggelheim
 A38  13.3747 0.74706 +0.66266 Campocatino Automated Telescope, Collepardo
 A39  12.4186 0.63084 +0.77336 Altenburg
 A40  14.4978 0.81104 +0.58306 Pieta
@@ -1059,7 +1073,7 @@
 A82  13.8744 0.70037 +0.71148 Osservatorio Astronomico di Trieste
 A83  29.9969 0.45945 +0.88525 Jakokoski Observatory
 A84  30.3333 0.80175 +0.59632 TUBITAK National Observatory
-A85  30.8065 0.68881 +0.72252 Odessa Astronomical Observatory, Kryzhanovka
+A85  30.8065 0.68881 +0.72252 Odesa  Astronomical Observatory, Kryzhanovka
 A86   4.3547 0.70170 +0.71021 Albigneux
 A87   8.7662 0.64935 +0.75798 Rimbach
 A88   8.901330.714961+0.696835Bolzaneto
@@ -1091,7 +1105,7 @@
 B14   9.0758 0.71061 +0.70138 Ca del Monte
 B15  13.0129 0.61111 +0.78890 Inastars Observatory, Potsdam (since 2006)
 B16  36.9547 0.56382 +0.82317 1st Moscow Gymnasium Observatory, Lipki
-B17  33.162800.705588+0.706256AZT-8 Evpatoria
+B17  33.162800.705588+0.706256AZT-8 Yevpatoriya
 B18  42.5008 0.72958 +0.68232 Terskol
 B19   2.4414 0.74963 +0.65966 Observatorio Iluro, Mataro
 B20   2.2636 0.75026 +0.65897 Observatorio Carmelita, Tiana
@@ -1146,7 +1160,7 @@
 B69   9.017190.662152+0.746956Owls and Ravens Observatory, Holzgerlingen
 B70   2.4937 0.74787 +0.66165 Sant Celoni
 B71   1.5213 0.75363 +0.65510 Observatorio El Vendrell
-B72   7.6811 0.63470 +0.77022 Soerth
+B72   7.681050.634701+0.770230Soerth Observatory
 B73   8.985030.662074+0.747029Mauren Valley Observatory, Holzgerlingen
 B74   1.105360.747550+0.662053Santa Maria de Montmagastrell
 B75   8.805190.701074+0.710741Stazione Astronomica Betelgeuse, Magnago
@@ -1232,13 +1246,14 @@
 C55                           Kepler
 C56                           LISA-Pathfinder
 C57                           TESS
+C58                           NEO Surveyor
 C59                           Yangwang-1
 C60   7.069260.634261+0.770545Argelander Institute for Astronomy Obs., Bonn
 C61   2.582020.658892+0.749723Chelles
 C62  11.3467 0.68967 +0.72175 Eurac Observatory, Bolzano
 C63   9.9797 0.69363 +0.71819 Giuseppe Piazzi Observatory, Ponte in Valtellina
 C64  15.284390.671380+0.738819Puchenstuben
-C65   0.729650.743841+0.666482Observatori Astronomic del Montsec
+C65   0.729650.743847+0.666488Observatori Astronomic del Montsec
 C66   2.8050 0.77084 +0.63493 Observatorio El Cielo de Consell
 C67  12.2199 0.59747 +0.79922 Gnevsdorf
 C68  23.893390.789058+0.612302Ellinogermaniki Agogi Observatory, Pallini
@@ -1255,7 +1270,7 @@
 C79   2.7855 0.74801 +0.66147 Roser Observatory, Blanes
 C80  39.7651 0.67959 +0.73115 Don Astronomical Observatory, Rostov-on-Don
 C81  10.840980.693023+0.718872Dolomites Astronomical Observatory
-C82  14.357630.760171+0.647611Osservatorio Astronomico Nastro Verde, Sorrento
+C82  14.357590.760172+0.647614Osservatorio Astronomico Nastro Verde, Sorrento
 C83  91.8425 0.55930 +0.82626 Badalozhnyj Observatory
 C84   2.243720.750690+0.658447Badalona
 C85   1.2408 0.77939 +0.62448 Observatorio Cala d'Hort, Ibiza
@@ -1268,7 +1283,7 @@
 C92  13.609950.727425+0.683915Valdicerro Observatory, Loreto
 C93  13.4064 0.74042 +0.67004 Bellavista Observatory, L'Aquila
 C94 103.0670 0.61962 +0.78241 MASTER-II Observatory, Tunka
-C95   5.712390.721401+0.690345SATINO Remote Observatory, Haute Provence
+C95   5.712390.721406+0.690350SATINO Remote Observatory, Haute Provence
 C96  13.8786 0.73544 +0.67537 OACL Observatory, Mosciano Sant Angelo
 C97  57.976330.916656+0.398354Al-Fulaij Observatory, Oman
 C98  11.1764 0.72335 +0.68818 Osservatorio Casellina, Scandicci
@@ -1276,7 +1291,7 @@
 D00  42.6536 0.72388 +0.68809 ASC-Kislovodsk Observatory
 D01  23.930610.495920+0.865471Andean Northern Observatory, Nummi-Pusula
 D02   2.051890.751414+0.657647Observatori Petit Sant Feliu
-D03  10.5889 0.71522 +0.69670 Rantiga Osservatorio, Tincana
+D03  10.588920.715223+0.696709Rantiga Osservatorio, Tincana
 D04  38.8569 0.70960 +0.70225 Krasnodar
 D05  42.500050.729580+0.682314ISON-Terskol Observatory
 D06  12.770170.747232+0.662472Associazione Tuscolana di Astronomia, Domatore
@@ -1296,26 +1311,61 @@
 D20 115.713110.854733-0.517343Zadko Observatory, Wallingup Plain
 D21 115.8150 0.8492  -0.5263  Shenton Park
 D22 115.816670.849044-0.526558UWA Observatory, Crawley
+D23   0.518530.749367+0.659977OAIA, Alcarras
 D24 117.089690.844095-0.534439LightBuckets Observatory, Pingelly
 D25 117.089780.844104-0.534424Tzec Maun Observatory, Pingelly (before 2010)
+D26   1.921310.722868+0.688750Peyrole Observatory, Peyrole
+D27   3.803610.725021+0.686446Observatoire de Fontcaude, Juvignac
+D28   2.182860.748708+0.660744Escaldarium Observatory,Caldes de Montbui
 D29 118.4639 0.84204 +0.53767 Purple Mountain Observatory, XuYi Station
+D30  11.083500.631405+0.772922Sternwarte Silbergraben, Erfurt
+D31  10.097970.714476+0.697520Osservatorio Aldebaran, Rivalba
 D32 119.599750.862770+0.504193JiangNanTianChi Observatory, Mt. Getianling
 D33 120.6982 0.92730 +0.37308 Kenting Observatory, Checheng
 D34 120.7839 0.92796 +0.37148 Kenting Observatory, Hengchun
 D35 120.8736 0.91818 +0.39597 Lulin Observatory
 D36 120.8897 0.91801 +0.39625 Tataka, Mt. Yu-Shan National Park
 D37 120.873250.918176+0.395972Lulin Widefield Telescope, Mt. Lulin
+D38   8.437640.709383+0.702495Tecnosky Astropark, Felizzano
 D39 122.049610.793971+0.605943Shandong University Observatory, Weihai
+D40  13.337720.748318+0.661176Frosinone
+D41  10.717040.727431+0.683991Osservatorio Astronomico Orciatico
+D42  11.190840.723565+0.687970Piero Angela Observatory, Scandicci
+D43   7.770390.707805+0.70416245th Parallel Observatory, Pino Torinese
 D44 124.139280.911427+0.410157Ishigakijima Astronomical Observatory
+D45  21.493250.639594+0.766177Kamyk, Trzesn
+D46   9.902650.671664+0.738525Observatory Bad Wurzach
+D47  11.563660.738665+0.671859BigBang Observatory, Manciano
+D48   7.263810.652979+0.754898Niederbexbach Observatory
+D49   0.794440.757213+0.650992L'Ametlla de Mar
+D50   5.215190.720062+0.691654Vaucluse Observatoire Celeste, Blauvac
+D51   1.948440.719539+0.692203Plateau Astronomique La Couronne
+D52   9.797500.707094+0.704768ULU Observatory, Caselle Landi
 D53 127.4820 0.63981 +0.76600 ISON-Blagoveschensk Observatory
 D54 127.4830 0.63981 +0.76601 MASTER-II Observatory, Blagoveshchensk
 D55 127.9747 0.79571 +0.60370 Kangwon Science High School Observatory, Ksho
+D56  11.674080.700775+0.711011Osservatorio Sideris Oculus, San Pietro in Gu
 D57 128.887440.817572+0.573996Gimhae Astronomical Observatory, Uhbang-dong
 D58 129.025000.818419+0.572736KSA SEM Observatory, Danggam-dong
+D59   7.156170.723595+0.688001MARIAMIR, Saint-Jeannet
+D60  13.551460.693649+0.718079Sparky's Stars, Masseris
 D61 134.9131 0.82671 +0.56075 Suntopia Marina, Sumoto
 D62 130.4494 0.83676 +0.54575 Miyaki-Argenteus
+D63  10.461380.719553+0.692176G. Pascoli Observatory, Barga (since June 2023)
+D64  14.109670.740711+0.669613Fucama, Casalincontrada
+D65  11.534810.702163+0.709679G. Beltrame, Arcugnano Vicenza
+D66   9.148390.703654+0.708197Civico Osservatorio Astronomico di Rozzano
+D67  37.624720.586136+0.807530Tula Rooftop Observatory, Tula
+D68  11.736220.702543+0.709270Osservatorio Galileo, Padova
+D69   9.970130.646988+0.760014JMU Space-Observatory
 D70 133.4686 0.83505 +0.54834 Tosa
+D71  15.892250.685516+0.725682ObservaSTYRium, Stainz bei Straden
+D72  16.361310.919630-0.392207WAA Remote Observatory, Hakos
+D73  16.361390.919632-0.392208SNX-NET, Hakos
 D74 134.6819 0.83041 +0.55530 Nakagawa
+D75  16.956080.772805+0.632534Cariati
+D76   2.007030.749354+0.660032AAT-Terrassa, Terrassa
+D77  10.717360.727433+0.683988TD-TRO (Tuscany Remote Observatory)
 D78 136.132810.822378+0.567077Iga-Ueno
 D79 138.630920.821212-0.568722YSVP Observatory, Vale Park
 D80 138.9728 0.80392 +0.59297 Gumma Astronomical Observatory
@@ -1336,6 +1386,8 @@
 D95 141.0680 0.78035 +0.62325 Kurihara
 D96 140.342160.827287-0.559905Tzec Maun Observatory, Moorook
 D97 140.5700 0.82752 -0.55956 Berri
+D98  11.334090.717444+0.694448Loiano TANDEM
+D99   0.391230.717357+0.694422AstroKoT, Port-Ste-Marie
 E00 144.2089 0.79902 -0.59937 Castlemaine
 E01 144.541420.798618-0.599924Barfold
 E03 145.3822 0.78756 -0.61419 RAS Observatory, Officer
@@ -1350,7 +1402,7 @@
 E13 149.0969 0.81622 -0.57597 Wanniassa
 E14 149.1100 0.81852 -0.57274 Hunters Hill Observatory, Ngunnawal
 E15 149.6061 0.82016 -0.57041 Magellan Observatory, near Goulburn
-E16 149.366240.831681-0.553654Grove Creek Observatory, Trunkey
+E16 149.366240.831684-0.553656Grove Creek Observatory, Trunkey
 E17 150.3417 0.8329  -0.5519  Leura
 E18 151.027140.829819-0.556191BDI Observatory, Regents Park
 E19 151.0958 0.83042 -0.55528 Kingsgrove
@@ -1363,9 +1415,18 @@
 E26 153.3971 0.88414 -0.46566 RAS Observatory, Biggera Waters
 E27 153.2667 0.8871  -0.4600  Thornlands
 E28 150.641050.833196-0.551210Kuriwa Observatory, Hawkesbury Heights
+E29 115.955330.845978-0.531426Mardella Observatory
+E41 138.890250.817664-0.573796Strathalbyn
+E42 139.570190.824586-0.563855AUSTRALIA1/SRI, Swan Reach
+E52 147.095970.817401-0.574196The Rock Regional Observatory, The Rock
+E54 149.081470.855509-0.516305TransAstra at Springbrook
+E55 149.064110.85562 -0.51621 GOTO South
+E62 149.081350.855509-0.516305Slooh.com Australia, Coonabarabran
 E81 173.2617 0.75267 -0.65622 Nelson
 E83 173.957030.749648-0.659621Wither Observatory, Witherlea
+E84 170.101870.717434-0.694397Twizel Observatory
 E85 174.894000.800696-0.597064Farm Cove
+E86 175.169370.758520-0.649478Speranza Observatory, Otaki
 E87 175.6540 0.76249 -0.64485 Turitea
 E89 176.2040 0.78759 -0.61421 Geyserland Observatory, Pukehangi
 E94 177.883310.782217-0.620920Possum Observatory, Gisborne
@@ -1390,7 +1451,7 @@
 G10 354.450550.792574+0.607765Clavier Observatory, Lora Del Rio
 G11   7.183790.630712+0.773465Breitenweg Observatory, Herkenrath
 G12   8.3306 0.62140 +0.78090 Sternwarte EG, Lippstadt
-G13   9.771690.451874+0.889103Astronomihagen, Fannrem
+G13   9.771640.451870+0.889105Astronomihagen, Fannrem
 G14   7.005200.725247+0.686239Novaloop Observatory, Mougins
 G15   9.1183 0.71116 +0.70080 Magroforte Observatory, Alessandria
 G16  13.348690.787948+0.613701OmegaLab Observatory, Palermo
@@ -1411,10 +1472,10 @@
 G31  13.7253 0.69946 +0.71233 CCAT Trieste
 G32 291.820400.921639-0.387713Elena Remote Observatory, San Pedro de Atacama
 G33   7.608790.623411+0.779293Wickede
-G34  13.7015 0.63254 +0.77203 Oberfrauendorf
+G34  13.701500.632547+0.772037Oberfrauendorf
 G35 249.157890.849476+0.526134Elephant Head Obsevatory, Sahuarita
 G36 357.452500.797538+0.601812Calar Alto-CASADO
-G37 248.577490.822887+0.566916Lowell Discovery Telescope
+G37 248.577790.822900+0.566927Lowell Discovery Telescope
 G38 356.768420.759967+0.647951Observatorio La Senda, Cabanillas del Campo
 G39 291.820390.921640-0.387711ROAD, San Pedro de Atacama
 G40 343.491740.881470+0.471441Slooh.com Canary Islands Observatory
@@ -1473,7 +1534,7 @@
 G93 249.3726 0.85215 +0.52201 Sonoita Research Observatory, Sonoita
 G94 249.9267 0.84971 +0.52594 Sonoran Skies Observatory, St. David
 G95 249.7622 0.85404 +0.51888 Hereford Arizona Observatory, Hereford
-G96 249.211280.845111+0.533614Mt. Lemmon Survey
+G96 249.211280.845107+0.533611University of Arizona Mt. Lemmon Survey
 G97 250.8694 0.84965 +0.52600 Astronomical League Alpha Observatory, Portal
 G98 251.343540.815037+0.578012Calvin-Rehoboth Observatory, Rehoboth
 G99 251.8104 0.84192 +0.53835 NF Observatory, Silver City
@@ -1513,7 +1574,7 @@
 H33 264.1217 0.80990 +0.58466 Bixhoma Observatory, Bixby
 H34 264.8258 0.84600 +0.53143 Chapel Hill
 H35 264.9517 0.77423 +0.63085 Leavenworth
-H36 264.2936 0.78043 +0.62323 Sandlot Observatory, Scranton
+H36 264.293450.780428+0.623229Sandlot Observatory, Scranton
 H37 265.2003 0.72947 +0.68182 Grems Timmons Observatories, Graettinger
 H38 265.9864 0.75079 +0.65840 Timberline Observatory, Urbandale
 H39 266.6828 0.70944 +0.70247 S.O.S. Observatory, Minneapolis
@@ -1557,7 +1618,7 @@
 H77 279.7653 0.89877 +0.43695 Buehler Observatory
 H78 282.708961.000183+0.021030University of Narino Observatory, Pasto
 H79 280.492700.723258+0.688308York University Observatory, Toronto
-H80 285.335670.763194+0.644015Halstead Observatory, Princeton
+H80 285.335670.763194+0.644015Halsted Observatory, Princeton
 H81 283.615390.738959+0.671615Hartung-Boothroyd Observatory, Ithaca
 H82 281.7839 0.77836 +0.62576 CBA-NOVAC Observatory, Front Royal
 H83 282.6641 0.77926 +0.62463 Timberlake Observatory, Oakton
@@ -1610,7 +1671,7 @@
 I30 299.3417 0.83966 -0.54131 Observatorio Geminis Austral
 I31 299.3649 0.83995 -0.54086 Observatorio Astronomico del Colegio Cristo Rey
 I32 299.3464 0.83969 -0.54125 Observatorio Beta Orionis, Rosario
-I33 289.2608 0.86504 -0.50086 SOAR, Cerro Pachon
+I33 289.266310.865052-0.500865SOAR, Cerro Pachon
 I34 284.1297 0.76548 +0.64134 Morgantown
 I35 301.5572 0.82198 -0.56762 Sidoli
 I36 301.282710.819978-0.570483Observatorio Los Campitos, Canuelas
@@ -1618,7 +1679,7 @@
 I38 302.021410.854400-0.517885Observatorio Los Algarrobos, Salto
 I39 301.426610.823342-0.565652Observatorio Cruz del Sur, San Justo
 I40 289.260610.873472-0.485986La Silla--TRAPPIST
-I41 243.140220.836325+0.546877Palomar Mountain--ZTF
+I41 243.140220.836322+0.546875Palomar Mountain--ZTF
 I42 288.9081 0.74895 +0.66041 Westport Observatory
 I43 261.902370.846901+0.530084Tarleton State University Obs., Stephenville
 I44 273.5176 0.86201 +0.50521 Northwest Florida State College, Niceville
@@ -1629,7 +1690,7 @@
 I49 253.986170.813183+0.580617Sunflower Observatory, Santa Fe
 I50 254.471420.840712+0.540309P2 Observatory, Mayhill
 I51 283.0547 0.78133 +0.62203 Clinton
-I52 249.211080.845113+0.533611Steward Observatory, Mt. Lemmon Station
+I52 249.211080.845109+0.533609Steward Observatory, Mt. Lemmon Station
 I53 356.3783 0.79822 +0.60052 Armilla
 I54 353.030810.779853+0.623912Observatorio Las Vaguadas, Badajoz
 I55 359.642140.772769+0.632566Valencia
@@ -1652,7 +1713,7 @@
 I72 355.9849 0.75923 +0.64893 Observatorio Carpe-Noctem, Madrid
 I73 359.587110.670611+0.739353Salvia Observatory, Saulges
 I74 358.187390.629588+0.774337Baxter Garden Observatory, Salisbury
-I75 359.9650 0.76735 +0.63910 Observatorio Castellon
+I75 359.9650 0.76735 +0.63910 Observatorio Los Caracoles, Castello
 I76 355.936810.761573+0.646107Observatorio Tesla, Valdemorillo
 I77 316.0025 0.94119 -0.33714 CEAMIG-REA Observatory, Belo Horizonte
 I78 355.5721 0.80240 +0.59481 Observatorio Principia, Malaga
@@ -1670,7 +1731,7 @@
 I90 351.597600.618315+0.783298Blackrock Castle Observatory
 I91 357.692500.801192+0.596407Retamar
 I92 353.952890.795987+0.603315Astreo Observatory, Mairena del Aljarafe
-I93 359.797000.713711+0.698096St Pardon de Conques
+I93 359.797040.713717+0.698101St Pardon de Conques
 I94 356.1367 0.76162 +0.64603 Observatorio Rho Ophiocus, Las Rozas de Madrid
 I95 356.813940.771993+0.633666Observatorio de la Hita
 I96 356.503840.758233+0.649960Hyperion Observatory, Urbanizacion Caraquiz
@@ -1681,7 +1742,7 @@
 J01 354.284500.739938+0.670609Observatorio Cielo Profundo, Leon
 J02 359.5550 0.78391 +0.61884 Busot
 J03 355.132500.638787+0.766833Gothers Observatory, St. Dennis
-J04 343.488170.881463+0.471461ESA Optical Ground Station, Tenerife
+J04 343.488180.881471+0.471466ESA Optical Ground Station, Tenerife
 J05 355.296390.749617+0.659822Bootes Observatory, Boecillo
 J06 358.812470.604374+0.794039Trent Astronomical Observatory, Clifton
 J07 353.895430.767881+0.638546Observatorio SPAG Monfrague, Palazuelo-Empalme
@@ -1734,7 +1795,7 @@
 J54 343.4906 0.88149 +0.47142 Bradford Robotic Telescope
 J55 344.3144 0.88549 +0.46313 Los Altos de Arguineguin Observatory
 J56 344.4536 0.88416 +0.46624 Observatorio La Avejerilla
-J57 358.890890.767817+0.638833Centro Astronomico Alto Turia, Valencia
+J57 358.890830.767822+0.638840Centro Astronomico Alto Turia 1
 J58 356.6644 0.62304 +0.77959 Brynllefrith Observatory, Llantwit Fardre
 J59 356.202560.726956+0.684386Observatorio Linceo, Santander
 J60 354.3406 0.74773 +0.66201 Tocororo Observatory, Arquillinos
@@ -1758,7 +1819,7 @@
 J78 358.8244 0.78887 +0.61253 Murcia
 J79 358.380660.795516+0.603908Observatorio Calarreona, Aguilas
 J80 359.1083 0.70862 +0.70323 Sainte Helene
-J81 358.1350 0.7360  +0.6749  Guirguillano
+J81 358.134890.735984+0.674878Guirguillano
 J82 357.3067 0.5935  +0.8021  Leyland
 J83 357.3883 0.59274 +0.80270 Olive Farm Observatory, Hoghton
 J84 358.9803 0.63144 +0.77285 South Observatory, Clanfield
@@ -1828,7 +1889,7 @@
 K48  10.838810.705714+0.706127Keyhole Observatory, San Giorgio di Mantova
 K49  11.185810.724381+0.687146Carpione Observatory, Spedaletto
 K50  11.133000.646903+0.760116Sternwarte Feuerstein, Ebermannstadt
-K51  11.6579 0.69563 +0.71626 Osservatorio del Celado, Castello Tesino
+K51  11.657890.695636+0.716268Osservatorio del Celado, Castello Tesino
 K52   7.6478 0.70548 +0.70642 Gwen Observatory, San Francesco al Campo
 K53  12.045640.744479+0.665409Marina di Cerveteri
 K54  11.336780.728803+0.682494Astronomical Observatory University of Siena
@@ -1840,7 +1901,7 @@
 K60  13.510690.568623+0.819848Lindby
 K61  13.6026 0.64741 +0.75967 Rokycany Observatory
 K62  13.846750.635514+0.769557Teplice Observatory
-K63  10.4620 0.71953 +0.69218 G. Pascoli Observatory, Castelvecchio Pascoli
+K63  10.462520.719536+0.692195G. Pascoli Observatory, Barga (before June 2023)
 K64  11.743970.644963+0.761748Waizenreuth
 K65  12.2339 0.71879 +0.69290 Cesena
 K66  12.628610.750491+0.658684Osservatorio Astronomico di Anzio
@@ -1860,12 +1921,12 @@
 K80  16.637330.610859+0.789111Platanus Observatory, Lusowko
 K81  13.785110.748666+0.660819P.M.P.H.R. Deep Sky Observatory, Atina
 K82  17.5894 0.75937 +0.64854 Alphard Observatory, Ostuni
-K83  11.043170.723487+0.688080Beppe Forti Astronomical Observatory, Montelupo
+K83  11.043170.723487+0.688080Osservatorio Astronomico Beppe Forti, Montelupo
 K84  10.758610.718340+0.693581Felliscopio Observatory, Fellicarolo
 K85   6.031610.634354+0.770499Kelmis
 K86  10.181890.701516+0.710308Brescia
 K87  10.170110.646647+0.760288Dettelbach Vineyard Observatory
-K88  19.8936 0.67154 +0.73869 GINOP-KHK, Piszkesteto
+K88  19.893670.671543+0.738689GINOP-KHK, Piszkesteto
 K89  11.563390.738665+0.671860Digital Stargate Observatory, Manciano
 K90  20.545770.714093+0.697776Sopot Astronomical Observatory
 K91  20.810190.845561-0.532618Sutherland-LCO A
@@ -1895,7 +1956,7 @@
 L15  25.978390.708234+0.703665St. George Observatory, Ploiesti
 L16  26.045610.705820+0.706098Stardreams Observatory, Valenii de Munte
 L17   2.7114 0.74071 +0.66964 Observatori Astronomic Albanya
-L18  26.718280.659348+0.749399QOS Observatory, Zalistci
+L18  26.718280.659348+0.749399QOS Observatory, Zalistsi
 L19  11.152580.716257+0.695653Osservatorio Felsina AAB, Montepastore
 L20  18.320690.722441+0.689239AG_Sarajevo Observatory, Sarajevo
 L21  27.421280.720179+0.691479Ostrov Observatory, Constanta
@@ -1910,7 +1971,7 @@
 L30   7.514690.624126+0.778737Lohbach Observatory, Benninghofen
 L31  12.856150.632524+0.772019RaSo Observatory, Chemnitz
 L32  20.810440.845576-0.532593Korea Microlensing Telescope Network-SAAO
-L33  29.9546 0.67379 +0.73646 Ananjev
+L33  29.9546 0.67379 +0.73646 Ananiv
 L34  14.020610.789742+0.611548Galhassin Robotic Telescope, Isnello
 L35  30.5086 0.64055 +0.76537 DreamSky Observatory, Lisnyky
 L36  14.780080.645319+0.761467Ondrejov--BlueEye600 Telescope
@@ -1927,11 +1988,11 @@
 L47  12.507110.725542+0.685961Osservatorio Astronomico, Piobbico
 L48  23.568730.674816+0.735566CNVL Observatory, Baia Mare
 L49  13.007300.671444+0.738747VEGA-Sternwarte, Dorfleiten
-L50  34.0114 0.71157 +0.70039 GenShtab Observatory, Nauchnij
-L51  34.0164 0.71169 +0.70028 MARGO, Nauchnij
+L50  34.0114 0.71157 +0.70039 GenShtab Observatory, Nauchnyi
+L51  34.0164 0.71169 +0.70028 MARGO, Nauchnyi
 L52  34.016940.711679+0.700287MASTER-Tavrida
-L53   9.033810.699589+0.712226Lomazzo Observatory, Como
-L54  22.888810.700709+0.711161Berthelot Observatory, Hunedoara
+L53   9.033810.699589+0.712226Aldo Agnetti Observatory, Como
+L54  22.888780.700704+0.711156Berthelot Observatory, Hunedoara
 L55  35.087500.666222+0.743283Sura Gardens, Dnipro
 L56   8.058580.638960+0.766697Sternwarte Limburg, Limburg
 L57  26.904190.688762+0.722601Bacau Observatory, Bacau
@@ -1976,13 +2037,22 @@
 L96  44.2745 0.76340 +0.64416 ISON-Byurakan Observatory
 L97 357.991610.624666+0.778298Castle Fields Observatory, Calne
 L98 357.434250.789394+0.612232La Sagra Observatory, Puebla de Don Fadrique
-L99  30.602810.635913+0.769201Novoselki
+L99  30.602810.635913+0.769201Novosilky
+M00  26.211550.490116+0.868754Viestikallio, Artjarvi
+M01  35.040730.866349+0.497900Weizmann Astrophysical Observatory
 M02   0.863860.754439+0.654271Astropriorat Observatory
 M03   2.258220.750568+0.658591Badalona Boreal
 M04   1.4256 0.74764 +0.66207 Pujalt Observatory, Barcelona
+M05   1.331610.729979+0.681267Observatoire de la Nine, Canens
+M06   0.743810.744130+0.665983PeLe's Observatory, Ager
+M07  10.294470.594202+0.801641Siek
+M08   4.0381 0.62786 +0.77573 CHON, Stekene
 M09   5.600940.630164+0.773882Observatory Gromme - Oudsbergen
 M10   6.854110.724305+0.687343CPF Observatory, St Vallier de Thiey
 M11   5.647180.720589+0.691192Novaastro Observatory, Banon
+M12  47.8639 0.55891 +0.82648 Puschino
+M13   7.742500.662866+0.746267Lucie Berger Observatory, Strasbourg
+M14   8.789390.699981+0.711832Schiaparelli Gallarate Station
 M15   9.1506 0.70039 +0.71142 Virgo Oservatory, Seveso
 M16   9.773190.719401+0.692358Osservatorio Il Coreggiolo
 M17   9.809220.719163+0.692525SN1572 Tycho Observatory, La Spezia
@@ -1992,7 +2062,7 @@
 M21  16.361440.919630-0.392206Schiaparelli Southern Observatory, Hakos
 M22  20.810590.845564-0.532612ATLAS South Africa, Sutherland
 M23  16.603500.679955+0.730852ELTE Gothard Observatory, Szombathely
-M24  16.200500.787195+0.614649Ardore Marina
+M24  16.200500.787195+0.614649La Macchina del Tempo, Ardore Marina
 M25  23.8283 0.47849 +0.87517 Einarin Observatory, Tampere
 M26  11.134940.723236+0.688304Zen Observatory, Scandicci
 M27  10.7175 0.72743 +0.68399 Elijah Observatory, Lajatico
@@ -2004,11 +2074,46 @@
 M33  34.763340.861632+0.506111OWL-Net, Mitzpe Ramon
 M34  17.273630.665591+0.743936AGO70, Astronomical Observatory, Modra
 M35  26.616690.688654+0.722734PS Observatory, Parjol
+M36  13.796470.699732+0.712090Opicina, Trieste
+M37  13.912430.696956+0.714892Astronomsko drustvo Nanos, Ajdovscina
+M38  21.767190.671089+0.738924Harsona Observatory, Nyiregyhaza
+M39  22.958880.760013+0.647750AUTH Observatory, Thessaloniki
+M40  31.827080.867372+0.496143OSTS-NRIAG, Kottamia
+M41  39.258270.930706+0.364567Jeddah
 M42  54.6708 0.90990 +0.41343 Emirates Observatory, Al Rahba
 M43  54.684780.912805+0.407034Al Sadeem Observatory, Abu Dhabi
 M44  54.920310.912502+0.407722Al-Khatim Observatory, Abu Dhabi
+M45  25.768890.697617+0.714205Starhopper Observatory, Sfantu Gheorghe
 M46  55.450330.905280+0.423399Althuraya Astronomy Center, Dubai
 M47  55.462050.904763+0.424484Sharjah Observatory, Sharjah
+M48  15.092220.794277+0.605535GAC - Via L. Sturzo Observatory, Catania
+M49  16.361720.919630-0.392206IAS Remote Observatory, Hakos
+M50  11.563750.738663+0.671862Virtual Telescope Project, Manciano
+M51   9.226970.655500+0.752709Robert Mayer Sternwarte, Heilbronn
+M52   8.578500.758941+0.649052Sassari
+M53  10.282190.585977+0.807623CAS Observatory, Preetz
+M54   7.077810.725140+0.686335Observatoire Albireo de Biot
+M55  19.987000.656685+0.751814Luckystar Observatory, Vazec
+M56   9.174830.700833+0.710985Varedo
+M57  14.020200.790651+0.610701Wide-field Mufara Telescope, Isnello
+M58  16.361330.919630-0.392207VdS Remote Observatory, Hakos
+M59   7.228830.680334+0.730616Rondchamp Observatory, Reconvilier
+M60  11.325540.717411+0.694492Virgil Observatory, Loiano
+M61   6.585810.624893+0.778108Observatory Moers Kapellen
+M62   7.134170.679741+0.731214Lajoux Observatory
+M63  18.369690.768886+0.637286RPF Observatory, Gagliano del Capo
+M64   0.239640.631065+0.773170Holbrook, Heathfield
+M65  28.324940.485072+0.871558Mustola Observatory, Lappeenranta
+M66  32.840190.820917+0.569526SNX-NET, Prodromos
+M67  58.636310.591867+0.803429Kolobov Observatory, Magnitogorsk
+M68  37.830520.563964+0.823064School 1502 Rooftop Obs., Moscow
+M69  54.745470.917029+0.397543Emirates Astronomical Observatory L.L.C
+M70  26.404090.875173-0.482645BOOTES-6, Bloemfontein
+M71  22.995620.760788+0.646852AUTH Astronomical Station, Noesis
+M72  32.840170.820914+0.569524AUTH Astronomical Station, Cyprus
+M73  54.745310.917018+0.397539Eden Emirates Observatory, Abu Dhabi
+M75  39.511550.699085+0.712651Online observatory, Peschany
+M77  39.965530.718110+0.693769Mezmay Comet Search Center
 M90  65.4286 0.54672 +0.83452 Chervishevo
 N27  73.7253 0.57847 +0.81298 Omsk-Yogik Observatory
 N30  74.3694 0.85369 +0.51909 Zeds Astronomical Observatory, Lahore
@@ -2018,28 +2123,54 @@
 N44  77.139310.785023+0.617693Shache Station, Langan Village
 N50  78.963830.842176+0.538692Himalayan Chandra Telescope, IAO, Hanle
 N51  78.964610.842178+0.538687GROWTH India Telescope, IAO, Hanle
-N55  80.026230.846497+0.532089Beimian Tianwentai, Ali, Tibet
-N56  80.026750.846503+0.532073Jiama'erdeng Tianwentai, Ali, Tibet
+N53  79.685300.872572+0.487612International Liquid Mirror Telescope
+N54  80.026740.846505+0.532071Purple Mountain Observatory, Jiama'erdeng
+N55  80.026230.846497+0.532089Corona Borealis Observatory, Ngari, Tibet
+N56  80.026750.846503+0.532073Jiama'erdeng Tianwentai JIST project, Ali, Tibet
+N57  80.046000.846724+0.531820YLT, NAOC
 N82  85.954940.641844+0.764450Multa Observatory
+N83  86.235040.749549+0.659927LW-1, NAOC-Korla
+N85  87.177010.727046+0.684749Megrez-NAOC
 N86  87.178520.727070+0.684719Xingming Observatory-KATS, Nanshan
 N87  87.175030.727076+0.684720Nanshan Station, Xinjiang Observatory
 N88  87.173220.727098+0.684697Xingming Observatory #3, Nanshan
 N89  87.179060.727107+0.684682Xingming Observatory #2, Nanshan
+N94  88.727920.675788+0.734831Altay Astronomical Observatory
 O02  90.526140.866434+0.498958Galaxy Tibet YBJ Observatory,Yangbajing
 O17  93.886690.783127+0.620730Purple Mountain Observatory, Lenghu-1
+O18  93.895220.782966+0.621021WFST, Lenghu
 O37  98.485530.948521+0.316891TRT-NEO, Chiangmai
+O38 101.045280.902014+0.431157Purple Mountain Observatory, Dayao
+O39 100.031060.894458+0.446769BOOTES-4, Lijiang
+O40 100.228610.875727+0.482435Xingyuan, Daocheng
+O41  99.465560.949569+0.312613Choakanan Observatory, Lampang
+O42 100.029000.894239+0.447183Gaomeigu Gemini Observatory, LiJiang
 O43  99.781110.994005+0.109127Observatori Negara, Langkawi
-O44 100.0310 0.89435 +0.44698 Lijiang Station, Yunnan Observatories
+O44 100.029730.894468+0.446765Lijiang Station, Yunnan Observatories
 O45 100.032610.894444+0.446808Yunnan-HK Observatory, Gaomeigu
+O46 100.226640.875738+0.482415Daocheng Glacier Observatory
 O47 101.134150.902535+0.429998Yunling Observatory, Yunnan
 O48 101.181540.903223+0.428442Purple Mountain Observatory, Yaoan (0.8-m)
 O49 101.181110.903206+0.428474Purple Mountain Observatory, Yaoan Station
 O50 101.439420.998617+0.052565Hin Hua Observatory, Klang
+O51 101.278690.975556+0.218996Akin Observatory, Rayong
+O52 100.729720.972224+0.233250Astro820, Samut Prakan
+O53 101.404030.967655+0.251610Pakchong, Nachonratchasima
+O54 100.949390.973370+0.228460TSky Observatory, Chonburi
+O55 101.854500.999100+0.042381Telok Kemang Observatory, Port Dickson
+O56 101.454560.967528+0.252097Jaichalad-Pailin Observatory
+O57 102.630940.957811+0.286532ROP KKN Observatory
+O58 101.454130.967528+0.252097SSTAC, Pak Chong
+O68 105.330900.793121+0.607347LW-2, NAOC-Zhongwei
 O72 106.334760.672017+0.738399OWL-Net, Songino
 O75 107.051800.672284+0.738151ISON-Hureltogoot Observatory
 O85 109.213000.826583+0.561181LiShan Observatory, Lintong
 P07 114.089870.928304-0.370597Space Surveillance Telescope, HEH Station
+P13 115.573330.769058+0.637315Baihuashan Observatory, Beijing
+P14 115.811670.848989-0.526638Nedlands
 P18 116.610830.757010+0.651328Birch Forest Observatory, LaBaGouMen
+P21 117.281460.850540-0.5242466R-AUS1, Youndegin
+P22 117.575880.762782+0.644702LW-3, NAOC-Xinglong
 P25 118.312740.910976+0.411089Kinmen Educational Remote Observatory, Jincheng
 P30 119.597080.862775+0.504181Jiangnantianchi Observatory, Anji
 P31 119.597360.862772+0.504189Starlight Observatory, Tianhuangping
@@ -2047,22 +2178,35 @@
 P35 120.556990.913398+0.405722Cuteip Remote Observatory, Changhua
 P36 120.626690.855207+0.516553ULTRA Observatory,Suzhou
 P37 120.639720.912980+0.406672HuiWen High School Observatory, Taichung City
+P38 120.714290.927137+0.373477Checheng Elementary School Observatory
 P40 121.539580.905916+0.422185Chinese Culture University, Taipei
+P41 121.7860 0.797583+0.601303Merak, NAOC
 P48 123.324030.258064-0.963413ASTEP, Concordia Station
+P61 126.330470.722664+0.688958Jilin Observatory
+P62 127.035970.809823+0.584732Jeonbuk Science High School Observatory
+P63 126.847500.817778+0.573621GSA Observatory, Gwangju
 P64 127.004890.796371+0.602805GSHS Observatory, Suwon
 P65 127.375680.805889+0.590124OWL-Net, Daedeok
 P66 127.446750.824763+0.563603Deokheung Optical Astronomy Observatory
 P67 127.7415 0.79040 +0.61057 Kangwon National University Observatory
+P68 127.474400.806556+0.589222DDSHS Biryong Observatory
+P69 127.475610.801895+0.595484ChungBuk National University Observatory
+P71 128.761080.815026+0.577520Miryang Arirang Astronomical Observatory
 P72 128.975950.808423+0.586939OWL-Net, Mt. Bohyun
 P73 129.0820 0.81744 +0.57412 BSH Byulsem Observatory, Busan
 P87 132.094190.830358+0.555374Hirao Observatory, Yamaguchi
 P93 133.544330.823371+0.565729Space Tracking and Communications Center, JAXA
 Q02 135.493440.825315+0.562809Sakai Observatory, Osaka
+Q06 136.495470.816116+0.575990Tarui Observatory, Tarui
+Q10 137.329440.821623+0.568142Toyokawa Observatory
 Q11 137.520690.820236+0.570158Shinshiro
 Q12 137.825360.805147+0.591292Nagano Observatory
+Q14 138.304440.811183+0.583125Goto Astronomical Observatory in Yatsugatake
 Q19 139.4390 0.81430 +0.57852 Machida
+Q20 139.570080.824585-0.563856Swan Reach Imaging, Glenalta
 Q21 139.853350.804747+0.591654Southern Utsunomiya
-Q23 140.3864 0.79654 +0.60264 Sukagawa
+Q22 140.341920.827286-0.559911SNX-NET, Moorook
+Q23 140.386460.796535+0.602639Sukagawa
 Q24 140.523500.810991+0.583108Katori
 Q33 142.482780.715989+0.695814Nayoro Observatory, Hokkaido University
 Q38 143.5506 0.81654 -0.57538 Swan Hill
@@ -2083,37 +2227,105 @@
 Q68 150.337420.832917-0.551813Blue Mountains Observatory, Leura
 Q69 150.449330.832777-0.551945Hazelbrook
 Q70 150.500440.919153-0.392623Glenlee Observatory, Glenlee
+Q71 149.069810.855626-0.516205SNX-NET, Siding Spring
+Q73 151.648940.841722-0.538113Buckthorn, Thornton
 Q78 152.947890.886807-0.460619Woogaroo Observatory, Forest Lake
 Q79 152.8481 0.88871 -0.45696 Samford Valley Observatory
 Q80 153.2160 0.88762 -0.45904 Birkdale
 Q81 153.096220.893194-0.448181Caloundra West
+R13 342.120710.877650+0.478474GOTO North
+R14 342.232060.878518+0.476188VillaDeMazoElHoyo
+R16 343.464640.880457+0.472653Tafuriaste, La Orotava
+R17 343.489690.881484+0.471430ATLAS-TDO
+R18 343.490250.881483+0.471432Two-meter Twin Telescope, TTT4
+R20 344.577110.882360+0.469022LaMelira, Las Palmas de Gran Canaria
+R44 353.011640.741813+0.668665Metis Trevinca Skies
+R45 353.011580.741811+0.668654Tycho Brahe, Trevinca
+R46 357.691430.599819+0.797488Lovell (76-m, Jodrell Bank)
+R47 355.751990.762362+0.645190Madrid DSS-63 (70-m)
+R48 358.890920.767825+0.638837Centro Astronomico Alto Turia 2
+R49 354.560480.772650+0.632947Observatorio Villuercas-Navezuelas, Navezuelas
+R50 354.406580.745697+0.664228Obsservatorio astronomico Orion
+R51 354.918080.765253+0.641682Astrogredos Observatory, Arenas de San Pedro
+R52 355.465030.803836+0.592881Observatorio IES Al-Baytar, Benalmadena
+R53 355.413330.803227+0.593731Pinos, Alhaurin de la Torre
+R54 356.788500.679215+0.731500Petit Cosquet, Bangor
+R55 357.232260.774034+0.631202ALFA CENTAURI, LAS MESAS
+R56 170.483890.720473-0.691324Scott Street Observatory, Lake Tekapo
 R57 170.472780.720489-0.691309Aorangi Iti Observatory, Lake Tekapo
 R58 170.490390.697579-0.714138Beverly-Begg Observatory, Dunedin
+R59 357.673420.787441+0.614744Camarasa Observatory, Astrocamp Nerpio
+R60 357.673440.787445+0.614750MonitorMyPlanet, Nerpio
+R61 358.630500.768299+0.638201Landete-Kea
+R62 359.113390.669125+0.740688lama'stro, Le Genest-Saint-Isle
+R63 358.779890.792058+0.608451Observatorio Sureste Estelar, Fuente Alamo
+R64 359.667520.632125+0.772282Steyning Observatory
 R65 172.349810.726556-0.684830R. F. Joyce Observatory, Christchurch
 R66 172.587610.726587-0.684777Mooray Observatory, Christchurch
+R67   0.283440.681028+0.729829Chinon Private Observatory, Chinon
+R68 359.676800.693026+0.718523Bourgeon Observatory
+R69   0.802580.678413+0.732240SAT01-Mntlouis sur Loire
+R70 359.620360.709877+0.701989WATCH, Beychac Et Caillau
+R71 359.504540.784613+0.617946Erchico, San Vicente Del Raspeig
+R72   2.035280.750193+0.659046RubiObservatory, Rubi
+R73   0.832890.680384+0.730428Observatoire de Tauxigny, Tauxigny
+R74   1.934940.751434+0.657653Observatori Puig d'Agulles, Vallirana
+R75   1.454860.753664+0.655084Rodamir, Roda de Bara
+R76   4.106670.638480+0.767079LEPTINA-ONE, Estinnes-au-val
+R77   3.727440.723117+0.688470Observatoire de l'etoile qui rit
+R78 175.091040.788021-0.613626Crystal Lake Observatory, Ngutunui
+R79   4.334030.708332+0.703766Observatoire Hubert Reeves, Mars
+R80   4.410890.708799+0.703289Observatoire International de Beauvert
+R83   5.646470.720583+0.691196Observatoire Banon La Tuilerie, Banon
+R85   7.071810.725295+0.686171Telescope Leonard de Vinci, GAPRA, Antibes
+R86   6.989470.681270+0.729861Mont-Soleil, Saint-Imier
+R87   6.922940.723628+0.688176Observatoire de la Cote d'Azur
+R88   7.144470.680871+0.730105La Porte des Etoiles, Corgemont
+R92   8.780940.600059+0.797286Osterholz-Scharmbeck
+R93   9.067190.710955+0.700966Sanse Observatory, San Sebastiano Curone
+R95   9.790450.718941+0.692828Fiammetta Observatory, La Spezia
+R97  10.539530.649091+0.758232Baudenbach
+R99  11.238080.723496+0.688038Giuliano Betti Observatory, Firenze
+S03  12.921560.670725+0.739321Stierlingwald, Buermoos
+S04  12.712850.744787+0.665093Osservatorio Astronomico Narciso Spuntoni
+S05  12.833320.668165+0.741616Sternwarte Burghausen
+S16  16.705000.759851+0.648047ASI Matera Flyeye
+S24  19.546830.671902+0.738204Szilard Leo Observatory, Bujak
+S30  21.497440.674553+0.735785Zenit, Hajduboszormeny
+S42  26.028890.716302+0.695479Institute of Space Science Magurele
+S43  26.022500.714576+0.697241StarBlazer Observatory, Bucharest
+S47  27.296610.721431+0.690213Alfastar - Astroclubul Bucuresti
+S61  31.973320.683582+0.727444Mykolaiv, 0.3m f/5 Telescope
+S86  40.325000.918760+0.393856Alamri astronomical observatory
+S89  41.425330.725190+0.687159FASTAU, Astrofarm Astroverts
+S93  42.666390.723844+0.688125INASAN-Kislovodsk Observatory
+T02 203.495720.934614+0.354517SNX-NET, Wailuku
 T03 203.742470.936240+0.351538Haleakala-LCO Clamshell #3
 T04 203.742490.936241+0.351538Haleakala-LCO OGG B #2
-T05 203.742990.936235+0.351547ATLAS-HKO, Haleakala
+T05 203.742990.936236+0.351547ATLAS-HKO, Haleakala
 T07 204.423870.943290+0.332467ATLAS-MLO Auxiliary Camera, Mauna Loa
 T08 204.423950.943290+0.332467ATLAS-MLO, Mauna Loa
-T09 204.523980.941706+0.337237Subaru Telescope, Maunakea
+T09 204.523960.941711+0.337239Subaru Telescope, Maunakea
 T10 204.522410.941706+0.337212Submillimeter Array, Maunakea (SMA)
-T11 204.530360.941731+0.337198United Kingdom Infrared Telescope, Maunakea
-T12 204.530570.941729+0.337199University of Hawaii 88-inch telescope, Maunakea
-T13 204.527710.941691+0.337263NASA Infrared Telescope Facility, Maunakea
-T14 204.531130.941714+0.337236Canada-France-Hawaii Telescope, Maunakea
-T15 204.530940.941727+0.337214Gemini North Observatory, Maunakea
-T16 204.525700.941703+0.337250W. M. Keck Observatory, Keck 1, Maunakea
-T17 204.525800.941700+0.337256W. M. Keck Observatory, Keck 2, Maunakea
-U52 237.451110.749240+0.660270Shasta Valley Observatory, Grenada
+T11 204.529650.941734+0.337191United Kingdom Infrared Telescope, Maunakea
+T12 204.530540.941733+0.337201University of Hawaii 88-inch telescope, Maunakea
+T13 204.527970.941707+0.337251NASA Infrared Telescope Facility, Maunakea
+T14 204.531090.941717+0.337240Canada-France-Hawaii Telescope, Maunakea
+T15 204.530930.941728+0.337214Gemini North Observatory, Maunakea
+T16 204.525260.941708+0.337246W. M. Keck Observatory, Keck 1, Maunakea
+T17 204.525740.941704+0.337256W. M. Keck Observatory, Keck 2, Maunakea
+T35 210.390200.953686-0.299837Astronomical Society of Tahiti
+U52 237.451000.749240+0.660270Shasta Valley Observatory, Grenada
 U53 237.1603 0.70274 +0.70909 Murray Hill Observatory, Beaverton
 U54 237.312860.782952+0.620081Hume Observatory, Santa Rosa
 U55 237.414560.653977+0.753984Golden Ears Observatory, Maple Ridge
 U56 237.869170.795044+0.604511Palo Alto
 U57 237.841280.795776+0.603616Black Mountain Observatory, Los Altos
+U62 238.955080.811970+0.581864TransAstra TKO at SkiesAway
 U63 239.194560.681217+0.729770Burnt Tree Hill Observatory, Cle Elum
 U64 239.461510.683272+0.727821CWU-Lind Observatory, Ellensburg
 U65 239.459830.683247+0.727841CWU Observatory, Ellensburg
+U66 240.920560.791644+0.609534June Lake Overlook
 U67 240.203580.776325+0.628595Jack C. Davis Observatory, Carson City
 U68 240.587010.799040+0.599620JPL SynTrack Robotic Telescope, Auberry
 U69 240.5870 0.79904 +0.59962 iTelescope SRO Observatory, Auberry
@@ -2131,15 +2343,22 @@
 U81 243.615140.827367+0.560037CS3-Trojan Station, Landers
 U82 243.615190.827368+0.560036CS3-Palmer Divide Station, Landers
 U83 243.573110.841238+0.53938 Mount Laguna Observatory
+U86 244.535560.857900+0.512937BOOTES-5, Bajo California
+U92 251.830000.827059+0.560862Astrottica Network USA2, Pie Town
+U93 246.287610.791740+0.609209Skygems Dreamscope Utah, Beryl Junction
+U94 246.302500.792006+0.608864iTelescope Observatory, Beryl Junction
+U95 251.829670.827058+0.560864USA1/HCRO, Pie Town
 U96 246.686000.579007+0.812698Athabasca University Geophysical Observatory
 U97 248.332920.818306+0.573452JPL SynTrack Robotic Telescope 3, Flagstaff
+U98 249.743000.849529+0.526090NAC Observatory, Benson
+U99 247.8537 0.829354+0.557017BCC Observatory, Black Canyon City
 V00 248.399810.849456+0.526492Kitt Peak-Bok
 V01 248.239110.762243+0.645493Mountainville Observatory, Alpine
 V02 248.057940.835743+0.547377Command Module, Tempe
 V03 248.3314 0.79889 +0.59979 Big Water
 V04 248.463310.819378+0.571927FRoST, Anderson Mesa
 V05 248.631950.836631+0.546101Rusty Mountain Observatory, Gold Canyon
-V06 249.267450.845317+0.533211Catalina Sky Survey-Kuiper
+V06 249.267450.845313+0.533209Catalina Sky Survey-Kuiper
 V07 249.1219 0.85208 +0.52234 Whipple Observatory, Mount Hopkins-PAIRITEL
 V08 249.339000.848249+0.528126Mountain Creek Ranch, Vail
 V09 249.742020.849537+0.526080Moka Observatory, Benson
@@ -2157,6 +2376,8 @@
 V21 251.102310.849511+0.526188Cewanee Observatory at DSNM
 V22 251.815500.827009+0.560941Insight Remote Observatory, Pie Town
 V23 252.764060.828722+0.558332FOAH Observatory, Magdalena
+V24 250.484030.850261+0.525020Sonoran Desert Skies Observatory, Pearce
+V25 253.301940.846331+0.531305Tortugas Mountain Observatory, Las Cruces
 V26 253.390200.911283+0.410639UAS-ISON Observatory, Cosala
 V27 253.718190.811354+0.583180North Mesa Observatory, Los Alamos
 V28 254.346470.817018+0.575271Deep Sky West Observatory, Rowe
@@ -2165,14 +2386,25 @@
 V31 254.4750 0.84061 +0.54046 Hazardous Observatory, Mayhill
 V32 254.471310.840709+0.540308Canvas View New Mexico Skies, Mayhill
 V33 254.720390.806382+0.590114Finlaystone Observatory, Angel Fire
-V34 255.369920.778401+0.626222Black Forest
+V34 255.369920.778401+0.626222Baker Observatory, Black Forest
 V35 255.918810.861839+0.506046Deep Sky Observatory Collaborative, Pier 5
 V36 255.617420.843042+0.536333The Ranch Observatory, Lakewood
 V37 255.984830.861053+0.507428McDonald Observatory-LCO ELP
 V38 255.984930.861051+0.507431McDonald Observatory-LCO ELP Aqawan A #1
-V39 255.984520.861051+0.507430McDonald Observatory-LCO ELP B
+V39 255.984830.861053+0.507427McDonald Observatory-LCO ELP B
 V40 255.918730.861839+0.506046Divine Creation Observatory, Fort Davis
 V41 256.725780.719992+0.691890Rapid City
+V42 254.474720.840614+0.540448Dimension Point, Mayhill
+V43 250.4842 0.85026 +0.52502 Chiricahua Skies Observatory, Sunizona
+V44 251.829830.827057+0.560864Coyote Watcher, Pie Town
+V45 255.984960.861332+0.507595McDonald Observatory-LCO ELP Aqawan B #1
+V46 253.695160.811343+0.583195Walnut Park Observatory, Los Alamos
+V47 255.984980.861332+0.507595McDonald Observatory-LCO ELP Aqawan B #2
+V48 249.398220.852111+0.522049TransAstra at Winer
+V54 259.692190.936737+0.349756Observatoire LAURIER, El Marques
+V55 260.617970.853052+0.520205The Gikem Observatory, Rockwood
+V56 260.304030.849505+0.525995Stonehenge Observatory, Novice
+V57 260.617740.853050+0.520209Starfront Observatories, Rockwood
 V58 260.734970.868735+0.493762Medina Dome, Medina
 V59 261.0734 0.86642 +0.49781 Millwood Observatory, Comfort
 V60 261.094730.862140+0.505126Putman Mountain Observatory
@@ -2180,28 +2412,35 @@
 V62 261.056610.858216+0.511726Live Oak Observatory, Pontotoc
 V63 261.057280.858219+0.511721Tara Observatory, Cherokee
 V70 263.335720.870056+0.491332Starry Night Observatory, Columbus
-V72 263.890110.752696+0.656235JDP Observatory, Omaha
+V72 263.890000.752697+0.656235JDP Observatory, Omaha
 V74 264.156890.869320+0.492598Katy Observatory, Katy
+V75 264.565780.874931+0.482617Live Oak Observatory, Lake Jackson
 V78 265.107800.700141+0.711688Spirit Marsh Observatory. Sauk Centre
 V81 265.7604 0.80902 +0.58590 Fayetteville
 V83 266.257280.781733+0.621590Rolling Hills Observatory, Warrensburg
 V86 266.8927 0.78221 +0.62099 Rattle Snake Observatory, Sedalia
 V88 267.428110.820618+0.569618River Ridge Observatory, Conway
+V92 268.349830.817712+0.573711White County Observatory, Searcy
 V93 268.616110.759765+0.648058Pin Oak Observatory, Fort Madison
 V94 268.661690.759876+0.647933Cherokeeridge Observatory, Fort Madison
 W04 271.009440.761606+0.645927Mark Evans Observatory, Bloomington
+W05 271.267190.836205+0.546596Tree Gate Farm Observatory, Starkville
 W08 271.883310.747086+0.662545Jimginny Observatory, Naperville
 W09 272.147530.752886+0.655985Willowed Plains Observatory, Manteno
 W11 272.6247 0.75272 +0.65618 Northwest Indiana Robotic Telescope, Lowell
+W13 273.473610.778448+0.625642Star Quarry Observatory, Bedford
 W14 273.245110.821914+0.567774Harvest
 W15 273.190830.810875+0.583314Wayne Observatory, Franklin
 W16 273.768690.822976+0.566292Pleasant Groves Observatory
+W17 273.771220.765700+0.641103Arrowhead, Sheridan
 W18 274.249620.767039+0.639505Red Fox Observatory, Pendleton
 W19 274.372830.740783+0.669559Kalamazoo
 W22 275.004470.844595+0.533635WestRock Observatory, Columbus
 W23 275.380190.772786+0.632594Hevonen Farm Observatory, Oxford
 W24 275.238170.722574+0.689025Shamrock Banks Observatory, Clare
 W25 275.635060.776417+0.628165RMS Observatory, Cincinnati
+W26 283.129110.771735+0.633872Starpool Observatory, Hampstead
+W27 286.573830.749769+0.659492RCNS, New Milford
 W28 276.3883 0.83011 +0.55581 Ex Nihilo Observatory, Winder
 W29 276.9939 0.76659 +0.64004 Adena Brook Observatory, Columbus
 W30 276.771170.838735+0.542749Georgia College Observatory, Milledgeville
@@ -2209,16 +2448,29 @@
 W32 277.237500.834222+0.549619Crawfordville Observatory
 W33 277.834510.819315+0.571499Transit Dreams Observatory, Campobello
 W34 277.8453 0.81784 +0.57360 Squirrel Valley Observatory, Columbus
+W35 278.039100.856610+0.514230Buffalo Creek Observatory, Nahunta
+W36 280.502000.748729+0.660767EliLauren Observatory, Neilltown
+W37 281.220140.736467+0.674280Transit Dreams Observatory-North, Hamburg NY
 W38 278.585310.807479+0.588163Dark Sky Observatory, Boone
-W42 279.465690.885511+0.463056Mind's Eye Observatory, Vero Beach
+W39 278.809440.878725+0.475726Robinson Observatory
+W40 281.529100.797117+0.601832Hampden-Sydney Observatory
+W41 279.540000.797348+0.601651Anderson Observatory
+W42 279.465710.885510+0.463056Mind's Eye Observatory, Vero Beach
+W43 285.431860.750738+0.658457MT_Hope_Cavu, Otisville
+W44 286.220170.755635+0.652808Duo Ursi de Saltu, Scarsdale
+W45 283.938280.802431+0.594736Benito Loyola Observatory, Virginia Beach
 W46 280.411920.818614+0.572448Foxfire Village
+W47 289.235010.862850-0.504261SNX-NET, Rio Hurtado
 W48 280.887000.811693+0.582156BKH Observatory, Chapel Hill
 W49 281.067570.778794+0.625380CBA-MM Observatory, Mountain Meadows
 W50 281.254040.813127+0.580167Apex
+W51 287.565440.755204+0.653287Custer Institute and Observatory
+W52 283.514190.778335+0.625736US Naval Academy Hopper Hall Observatory
 W53 282.315240.771140+0.634559Hagerstown
 W54 282.289440.785431+0.616890Mark Slade Remote Observatory, Wilderness
 W55 282.583890.773703+0.631447Natelli Observatory, Frederick
 W56 282.525830.773143+0.632153Pineapple Observatory, Frederick
+W57 289.260950.873473-0.485999ESA TBT La Silla Observatory
 W58 283.149640.777667+0.626574ALPHA Observatory, South Laurel
 W59 284.107580.757005+0.651302The Dark Side Observatory, Weatherly
 W60 286.366260.995574+0.097155AstroExplor Observatory, Tinjaca
@@ -2237,12 +2489,12 @@
 W73 289.321560.957949-0.287797Observatorio Astronomico de Moquegua, Carumas
 W74 289.262450.873451-0.486040Danish Telescope, La Silla
 W75 289.609440.910001-0.414150SPECULOOS-South Observatory, Paranal
-W76 289.236950.862826-0.504288CHILESCOPE Observatory, Rio Hurtad
+W76 289.236950.862826-0.504288CHILESCOPE Observatory, Rio Hurtado
 W77 287.4010 0.75196 +0.65702 Skyledge Observatory, Killingworth
 W78 288.883250.739859+0.670509Clay Telescope, Harvard University
 W79 289.195350.865587-0.499763Cerro Tololo-LCO Aqawan B #1
 W80 288.7678 0.74138 +0.66885 Westwood
-W81 288.999670.724557+0.686948Nebula Knoll Observatoy, East Wakefield
+W81 288.999670.724557+0.686948Nebula Knoll Observatory, East Wakefield
 W82 288.878040.736419+0.674274Mendel Observatory, Merrimack College
 W83 288.697470.740821+0.669461Whitin Observatory, Wellesley
 W84 289.193580.865572-0.499793Cerro Tololo-DECam
@@ -2255,7 +2507,7 @@
 W91 289.602570.910007-0.414148VHS-VISTA, Cerro Paranal
 W92 290.673570.850987-0.524150MASTER-OAFA Observatory, San Juan
 W93 289.196000.865589-0.499755Korea Microlensing Telescope Network-CTIO
-W94 291.820190.921646-0.387713MAP, San Pedro de Atacama
+W94 291.820190.921646-0.387713MAPS, San Pedro de Atacama
 W95 291.820120.921639-0.387712Observatorio Panameno, San Pedro de Atacama
 W96 291.820060.921637-0.387717CAO, San Pedro de Atacama (since 2013)
 W97 291.820240.921638-0.387716Atacama Desert Observatory, San Pedro de Atacama
@@ -2267,28 +2519,89 @@
 X03 289.203610.862286-0.505209Observatoire SADR, Poroto
 X04 291.567470.664264+0.745000MCD Observatory, Saint-Anaclet
 X05 289.250580.864981-0.500958Simonyi Survey Telescope, Rubin Observatory
+X06 289.146490.862374-0.505110Skygems Chile, Rio Hurtado
+X07 289.146390.862374-0.505109iTelescope Deep Sky Chile, Rio Hurtado
+X08 289.235000.862852-0.504255ShAO Chile station, El Sauce
+X09 289.146700.862375-0.505108Deep Random Survey, Rio Hurtado
+X10 291.820400.921644-0.387717OVTLN, San Pedro de Atacama
+X11 289.596040.909953-0.414324VLT Survey Telescope, Paranal
 X12 295.712000.803430-0.593455Observatorio Los Cabezones
 X13 295.4498 0.85269 -0.52103 Observatorio Remoto Bosque Alegre
 X14 295.832220.854475-0.517879Observatorio Orbis Tertius, Cordoba
+X15 291.820530.921647-0.387711ABYO, San Pedro de Atacama
+X16 293.8497 0.95511 -0.29667 Astronomia Sigma Octante, Cochabamba
+X17 289.262080.873456-0.486033BlackGEM
+X18 291.820530.921646-0.3877106R-POL2, San Pedro de Atacama
+X19 290.673830.850988-0.524154Santel Observatory, El Leoncito
+X20 291.820520.921646-0.387713BOOTES-7, San Pedro Atacama
+X21 289.146810.862374-0.505109RoSaMund Obervatory - DSC, Rio Hurtado
+X22 289.147000.862368-0.505120BTN-1, Deep Sky Chile
+X23 291.820530.921647-0.387710OVTLN2, San Pedro de Atacama
+X24 289.988310.887329-0.460106Observatorio Desierto Cosmico, Atacama
+X25 289.146780.862375-0.505111UBC Southern Observatory
+X26 295.572330.852247-0.521566NAOS, Alta Gracia
+X27 289.200810.865545-0.499828SARA-CT
+X29 299.137610.840299-0.540322Observatorio Astronomico Municipal de Funes
 X31 299.479340.850485-0.524263Galileo Galilei Observatory, Oro Verde
 X33 299.990390.998647-0.051941OARU, Manaus
 X38 301.137110.825648-0.562299Observatorio Pueyrredon, La Lonja
 X39 301.1378 0.82615 -0.56158 Observatorio Antares, Pilar
 X40 301.616890.822572-0.566762Cielos de Banfield, Banfield
+X41 301.605500.821536-0.568259Observatorio Proton-Proton, Longchamps
 X50 303.824190.821025-0.568999Observatorio Astronomico de Montevideo
 X57 305.406260.903659-0.426885Polo Astronomico CMF,Foz do Iguacu
+X60 306.425560.895232-0.444317Guaraciaba Observatory
 X70 308.433220.931623-0.362375Observatorio OATU, Tupi Paulista
-X74 309.1506 0.92987 -0.36684 Observatorio Campo dos Amarais
+X72 308.878890.868775-0.493560Waccobs, Sao Leopoldo
+X74 309.494220.931569-0.362525Observatorio Campo dos Amarais
+X76 309.990970.990274-0.138870SUN Observatory, Redencao
+X77 309.924750.900184-0.434346Centro Astron. Nevoeiro, Antonio Olinto
+X86 312.218330.918367-0.394621Ottoservatorio, Tatui
 X87 312.0889 0.96218 -0.27210 Dogsheaven Observatory, Brasilia
 X88 312.491310.918012-0.395458Observatorio Adhara, Sorocaba
 X89 312.217860.962401-0.271311Rocca Observatory, Brasilia
 X90 312.132080.963322-0.268189Carina Observatory, Brasilia
+X91 312.788810.917193-0.397452Orion-Colesanti observatory, Mairinque
 X93 313.6047 0.92363 -0.38244 Munhoz Observatory
 Y00 315.215040.935906-0.351562SONEAR Observatory, Oliveira
+Y01 316.015800.940890-0.337985SONEAR 2 Observatory, Belo Horizonte
+Y05 316.310000.941320-0.337075SONEAR Wykrota-CEAMIG, Serra da Piedade
 Y16 318.687940.929268-0.368170ROCG, Campos dos Goytacazes
 Y28 321.3126 0.98840 -0.15179 OASI, Nova Itacuruba
 Y40 324.038890.989706-0.143217Discovery Observatory, Caruaru
+Y63 352.133680.856447+0.515346SNX-NET, Oukaimeden
+Y64 343.489610.881484+0.471433Transient Survey Telescope (TST), Teide
+Y65 343.490420.881484+0.471429Two-meter Twin Telescope, TTT1
+Y66 343.490530.881484+0.471429Two-meter Twin Telescope, TTT2
+Y67 352.132920.856451+0.515335High Atlas Window to the Kosmos,Oukaimeden
+Y68 343.490770.881482+0.471432Two-meter Twin Telescope, TTT3
+Y70 353.372380.786766+0.615329ApolloIV5, Fregenal de la Sierra
+Y71 353.372510.786768+0.615327Makroskooppi, Fregenal de la Sierra
+Y75 354.581280.786275+0.615972Abraham Zacut, Salamanca
+Y76 359.791890.770614+0.635186Observatorio NovaCanet, Canet de Berenguer
+Y77 356.388580.758313+0.649939Cotos de Monterrey, Venturada
+Y78 359.466170.773792+0.631365Tros Alt
+Y79 359.992700.701911+0.709914Observatoire de la grande vallee
+Y80 357.166420.673761+0.736498Brenehuen, Grand-Champ
+Y81 356.5733 0.56175 +0.82456 Forthimage, Edinburgh
+Y82 358.065480.630258+0.773810LPMR Observatory, Broad Chalke
+Y83 359.047610.748699+0.660768Observatorio Arcosur, Zaragoza
+Y84 358.119720.665503+0.743909Observatoire de Bretagne
+Y85 351.853890.727084+0.684321Magalofes Observatory, Fene
+Y86 357.480030.796010+0.603469Observatorio de Seron
+Y87 353.011940.741821+0.668656Trevinca Skies-Amalthea, Trevinca
+Y88 353.011940.741819+0.668659ASERO, Valdin
+Y89 353.011890.741825+0.668670Proxima Centauri Observatory, Valdin
 Y90 354.5553 0.73015 +0.68115 Observatorio ESTELIA, Ladines
+Y91 354.833500.802497+0.594854Ras Algethi, Ronda
+Y92 354.534820.787182+0.614800JD Cassini, Piconcillo
+Y93 355.433220.746699+0.663112Observatorio Azahar, Valoria la Buena
+Y94 354.585710.732833+0.678415LCB Lugueros observatory, Valdelugueros
+Y95 357.998640.785356+0.617157Pradillos Ferez
+Y96 358.089320.762606+0.645079Observatorio de Vega del Codorno
+Y97 359.643030.713822+0.697993Bommes Observatory, Bommes
+Y98 358.686920.617953+0.783613Southside Observatory, Steeple Aston
+Y99 359.072990.748454+0.661036Observatorio del Lucero del Alba
 Z00 353.265860.798528+0.599968BOOTES-1, Mazagon
 Z01 352.133210.856462+0.515344OWL-Net, Oukaimeden
 Z02 352.133310.856450+0.515339HAO observatory, Oukaimeden
@@ -2310,7 +2623,7 @@
 Z18 342.108110.877671+0.478415Gran Telescopio Canarias, Roque de los Muchachos
 Z19 342.110940.877701+0.478380La Palma-TNG
 Z20 342.1217 0.87763 +0.47850 La Palma-MERCATOR
-Z21 343.488300.881468+0.471452Tenerife-LCO Aqawan A #1
+Z21 343.488300.881475+0.471455Tenerife-LCO Aqawan A #1
 Z22 343.4894 0.88148 +0.47143 MASTER-IAC Observatory, Tenerife
 Z23 342.114920.877679+0.478433Nordic Optical Telescope, La Palma
 Z24 343.488480.881475+0.471460Tenerife Observatory-LCO B, Tenerife
@@ -2320,7 +2633,7 @@
 Z28 357.673310.787438+0.614748Northern Skygems Observatory, Nerpio
 Z29 354.119440.751634+0.657576Observatorio Astronomico Sobradillo
 Z30 355.525000.586571+0.807215Glyn Marsh Observatory, Douglas
-Z31 343.488350.881476+0.471458Tenerife Observatory-LCO A, Tenerife
+Z31 343.488350.881474+0.471457Tenerife Observatory-LCO A, Tenerife
 Z32 358.983720.766879+0.640130Observatorio Astrofisico de Javalambre
 Z33 357.673310.787438+0.6147486ROADS Observatory 2, Nerpio
 Z34 359.112330.612800+0.787622NNHS Drummonds Observatory
@@ -2347,7 +2660,7 @@
 Z55 354.9150 0.79391 +0.60604 Uraniborg Observatory, Ecija
 Z56 350.2119 0.61577 +0.78529 Knocknaboola
 Z57 355.425890.803207+0.593753Observatorio Zuben, Alhaurin de la Torre
-Z58 355.630680.762093+0.645483ESA Cebreros TBT Observatory, Cebreros
+Z58 355.630680.762093+0.645483ESA TBT Cebreros Observatory
 Z59 357.715400.599292+0.797871Chelford Observatory
 Z60 357.8506 0.73205 +0.67900 Observatorio Zaldibia
 Z61 359.064000.748594+0.660857Montecanal Observatory, Zaragoza
@@ -2371,13 +2684,13 @@
 Z79 357.453270.797556+0.601783Calar Alto TNO Survey
 Z80 359.628080.623054+0.779568Northolt Branch Observatory
 Z81 355.732400.802530+0.594629Observatorio Estrella de Mar
-Z82 355.959030.802135+0.595173BOOTES-2 Observatory, Algarrobo
+Z82 355.958970.802136+0.595174BOOTES-2 Observatory, Algarrobo
 Z83 356.2881 0.76033 +0.64755 Chicharronian 3C Observatory, Tres Cantos
-Z84 357.451790.797523+0.601826Calar Alto-Schmidt
+Z84 357.451840.797536+0.601835Calar Alto-Schmidt
 Z85 356.750280.801058+0.596932Observatorio Sierra Contraviesa
 Z86 356.8900 0.62347 +0.77923 St. Mellons
 Z87 357.102100.608005+0.791293Stanley Laver Observatory, Pontesbury
-Z88 357.5101 0.62716 +0.77632 Fosseway Observatoy, Stratton-on-the-Fosse
+Z88 357.5101 0.62716 +0.77632 Fosseway Observatory, Stratton-on-the-Fosse
 Z89 357.8281 0.59942 +0.79777 Macclesfield
 Z90 357.8482 0.79540 +0.60418 Albox
 Z91 358.749990.631731+0.772595Curdridge
diff --git a/ObsCodesF.html b/ObsCodesF.html
index 9c5c1baf..2e11ddb9 100644
--- a/ObsCodesF.html
+++ b/ObsCodesF.html
@@ -16,7 +16,7 @@
       astrometric observations and orbits of minor planets (asteroids) and comets.">
 
   <meta name="keywords" content="astrometry, observations, orbits,
-      minor planets, asteroids, comets, near earth objects, 
+      minor planets, asteroids, comets, near earth objects,
       potentially hazardous asteroids">
 
   <script type="text/javascript" src="/js/jquery-latest.js"></script>
@@ -53,8 +53,8 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
               <ul>
                 <li><a href="/">Home</a></li>
                 <li><a href="/about">About</a></li>
-		<!-- Contact link changed to Jira -->
-                <li><a href="https://mpc-service.atlassian.net/servicedesk/customer/portals">Contact</a></li>
+      <!-- Contact link changed to Jira -->
+                <li><a href="https://mpc-service.atlassian.net/servicedesk/customer/portals">Helpdesk</a></li>
               </ul>
             </nav>
             <!-- search-form -->
@@ -87,16 +87,17 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
                 <li><a href="/mpec/RecentMPECs.html">MPECs</a></li>
                 <li><a href="/iau/NEO/toconfirm_tabular.html">NEO Confirmation</a></li>
                 <li><a href="/iau/NEO/pccp_tabular.html">Possible Comet Confirmation</a></li>
+                <li><a href="/mpcops/submissions/cometary/">Report Cometary Activity</a></li>
                 <li><a href="/iau/Ephemerides/EphemOrbEls.html" class="nested">Orbital Elements</a>
                   <ul>
                     <li><a href="/iau/MPCORB.html">MPCORB</a></li>
                     <li><a href="/iau/ECS/MPCAT/MPCAT.html">MPCAT</a></li>
                     <li><a href="/iau/ECS/MPCUPDATE/MPCUPDATE.html">MPCUPDATE</a></li>
                     <li><a href="/iau/Ephemerides/SoftwareEls.html">Orbital Elements for Software</a></li>
-                  </ul>                
+                  </ul>
                 </li>
                 <li><a href="/iau/services/MPCServices.html">Publications Overview</a></li>
-                <li><a href="/iau/ECS/MPCArchive/MPCArchive_TBL.html">Publications Archive</a></li>              
+                <li><a href="/iau/ECS/MPCArchive/MPCArchive_TBL.html">Publications Archive</a></li>
                 <li><a href="/iau/NEO/TheNEOPage.html" class="nested">NEO Services</a>
                   <ul>
                     <li><a href="/iau/NEO/toconfirm_tabular.html">Confirmation</a></li>
@@ -107,8 +108,17 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
                     <li><a href="/neocp_followup_report/">NEOCP Followup Report Form</a></li>
                     <li><a href="/neocp_followup_reports/">NEOCP Followup Reports</a></li>
                     <li><a href="/neocp_obs">NEOCP Recent Observations</a></li>
+                    <li><a href="/mpcops/neocp/neocp_plots/">NEOCP Plots</a></li>
+                    <li><a href="/iau/recovery/recovery.html">NEO Recovery</a></li>
                   </ul>
                 </li>
+
+                <li><a href="" class="nested">Observations</a>
+                  <ul>
+                    <li><a href="/wamo">WAMO</a></li>
+                  </ul>
+                </li>
+
                 <li><a href="/iau/services/WebCSAccess.html" class="nested">Other Observer Services</a>
                   <ul>
                     <li><a href="/whatsup">Observing Target List</a></li>
@@ -116,10 +126,20 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
                     <li><a href="/iau/MPEph/NewObjEphems.html">New Object Ephemerides</a></li>
                     <li><a href="/cgi-bin/checkmp.cgi">MPChecker</a></li>
                     <li><a href="/cgi-bin/checkcmt.cgi">CMTChecker</a></li>
-                    <li><a href="/iau/artsats/artsats.html">Distant Artificial Satellites</a></li>
+<!-- THIS PAGE IS NO LONGER SUPPORTED   <li><a href="/iau/artsats/artsats.html">Distant Artificial Satellites</a></li> -->
                     <li><a href="/iau/lists/Customize.html">Observing List Customizer</a></li>
+                    <li><a href="/iau/delays/neocp_delay.html">Processing Times</a></li>
                   </ul>
                 </li>
+
+      <li><a href="/" class="nested">Identifications</a>
+        <ul>
+          <li><a href="/mpcops/documentation/identifications/">Documentation</a></li>
+          <li><a href="/mpcops/documentation/identifications/submission_format/">Submission Format</a></li>
+                    <li><a href="/mpcops/submissions/identifications/">Submit</a></li>
+        </ul>
+      </li>
+
                 <li><a href="/db_search">Orbits/Observations Database</a></li>
 
                 <li><a href='http://alcdef.org'>Light Curve Database</a></li>
@@ -130,8 +150,11 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
                   <ul>
                     <li><a href="/iau/info/TechInfo.html">MPC Submission Info</a></li>
                     <li><a href="/iau/info/Astrometry.html">Astrometry Guide</a></li>
-                    <li><a href="/iau/WhatsNew.html">What's New</a></li>
-                  </ul>                
+                    <li><a href="/mpcops/documentation/artificial_satellites/">Artificial Satellites</a></li>
+                    <li><a href="/submit_action_code">Submit Action Code</a></li>
+                    <li><a href="/mpcops/documentation/">Other</a></li>
+                    <!-- <li><a href="/iau/WhatsNew.html">What's New</a></li> -->
+                  </ul>
                 </li>
                 <li><a href="/iau/lists/Lists.html" class="nested">Lists and Plots</a>
                   <ul>
@@ -153,14 +176,15 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
                         <li><a href="/iau/lists/ClosestComets.html">Closest Approaches</a></li>
                         <li><a href="/iau/lists/PeriodicCodes.html">Periodic Comets</a></li>
                       </ul>-->
-                    <li><a href="/iau/lists/ObsCodesF.html">Observatory Codes</a></li>		    
+                    <li><a href="/iau/lists/ObsCodesF.html">Observatory Codes</a></li>
                     <li><a href="/iau/Animations/Animations.html">Animations</a></li>
-                  </ul>                
+                  </ul>
                 </li>
                 <li><a href="/iau/MPCStatus.html">MPC Status</a></li>
                 <!--<li><%= link_to 'Summary', :controller => 'mpc', :action => 'summary' %></li>-->
                 <li><a href='/mpc/obs_stats_2014_2018'>2014-18 NEO Obs Statistics</a></li>
                 <li><a href='/mpc/summary'>Summary of Latest Data</a></li>
+                <li><a href='/deprecated-pages.html'>Deprecated Webpages</a></li>
               </ul>
             </li>
             <li><a href="/data"><span>DATA</span></a>
@@ -168,7 +192,7 @@ <h1 class="logo"><a href="/">The International Astronomical Union Minor Planet C
             <li><a href="http://iawn.net/"><span>IAWN</span></a>
             </li>
             <li><a href="https://minorplanetcenter.net/mpcops/beta/"><span>BETA</span></a></li>
-            <li><a href="/iau/MPCStatus.html"><span style="color:GoldenRod">STATUS</a></li>
+            <li><a href="/iau/MPCStatus.html"><span style="color:Green">STATUS</a></li>
             <li><a href="https://sbnmpc.astro.umd.edu/"><span>SBN ANNEX</span></a></li>
           </ul>
         </nav>
@@ -263,10 +287,10 @@ <h2>List Of Observatory Codes</h2>
 050  18.0582  0.51118  +0.85660  Stockholm (before 1931)
 051  18.4766  0.83055  -0.55508  Royal Observatory, Cape of Good Hope
 052  18.3083  0.51224  +0.85597  Stockholm-Saltsj&#246;baden
-053  18.9642  0.67688  +0.73373  <a href="http://www.konkoly.hu/">Konkoly Observatory, Budapest (since 1934)</a>
+053  18.9642  0.67688  +0.73373  <a href="http://www.konkoly.hu/">Konkoly Observatory, Budapest (since 1933)</a>
 054  11.6654  0.56595  +0.82169  Brorfelde
 055  19.9596  0.64321  +0.76316  Cracow
-056  20.2450  0.65501  +0.75346  Skalnat&#233; Pleso
+056  20.23418 0.655001 +0.753470 Skalnat&#233; Pleso
 057  20.5133  0.71074  +0.70116  Belgrade
 058  20.4950  0.57897  +0.81262  Kaliningrad
 059  20.2201  0.65500  +0.75364  Lomnick&#253; &#352;t&#237;t
@@ -309,12 +333,12 @@ <h2>List Of Observatory Codes</h2>
 096   9.4283  0.69967  +0.71215  Merate
 097  34.7625  0.86165  +0.50608  <a href="http://wise-obs.tau.ac.il/">Wise Observatory, Mitzpeh Ramon</a>
 098  11.56900 0.697916 +0.714090 Asiago Observatory, Cima Ekar
-099  25.53    0.483    +0.873    Lahti
-100  24.13    0.462    +0.884    &#196;ht&#228;ri
+099  25.53529 0.484073 +0.872114 Lahti
+100  24.14145 0.461165 +0.884370 &#196;ht&#228;ri
 101  36.2322  0.64403  +0.76246  Kharkov
 102  36.75953 0.564841 +0.822468 Zvenigorod
 103  14.52774 0.695365 +0.716346 <a href="http://astro.ago.fmf.uni-lj.si">Ljubljana</a>
-104  10.8042  0.71985  +0.69202  <a href="http://www.gamp-pt.net/">San Marcello Pistoiese</a>
+104  10.80375 0.719842 +0.692040 <a href="http://www.gamp-pt.net/">San Marcello Pistoiese</a>
 105  37.5706  0.56403  +0.82302  Moscow
 106  14.0711  0.69662  +0.71519  <a href="http://www.observatorij.org/">&#268;rni Vrh</a>
 107  11.0030  0.70998  +0.70186  <a href="http://www.astrocavezzo.it/">Cavezzo</a>
@@ -325,7 +349,7 @@ <h2>List Of Observatory Codes</h2>
 112  10.9039  0.70232  +0.70950  Pleiade Observatory, Verona
 113  13.0166  0.63502  +0.77001  <a href="http://www.sternwarte-drebach.de/">Volkssternwarte Drebach, Schoenbrunn</a>
 114  41.4277  0.72489  +0.68702  Engelhardt Observatory, Zelenchukskaya Station
-115  41.4416  0.72492  +0.68699  Zelenchukskaya
+115  41.44067 0.725004 +0.686912 Zelenchukskaya
 116  11.5958  0.66893  +0.74094  Giesing
 117  11.5385  0.66897  +0.74092  Sendling
 118  17.2740  0.66558  +0.74394  <a href="https://fmph.uniba.sk/en/microsites/daa/division-of-astronomy-and-astrophysics/">Astronomical and Geophysical Observatory, Modra</a>
@@ -336,7 +360,7 @@ <h2>List Of Observatory Codes</h2>
 123  44.2917  0.76352  +0.64398  <a href="https://www.bao.am/">Byurakan</a>
 124   2.2550  0.72534  +0.68612  Castres
 125  44.78950 0.747594 +0.662026 Tbilisi
-126   9.7903  0.71893  +0.69283  <a href="http://www.osservatorioiras.com/iras/index.php/en/">Monte Viseggi</a>
+126   9.7903  0.71893  +0.69283  <a href="http://www.astrofilispezzini.org">Monte Viseggi</a>
 127   6.9797  0.63385  +0.77088  Bornheim
 128  46.00661 0.623279 +0.779393 Saratov
 129  45.92    0.777    +0.628    Ordubad
@@ -370,7 +394,7 @@ <h2>List Of Observatory Codes</h2>
 157  12.8117  0.74166  +0.66864  <a href="http://www.ara.roma.it/">Frasso Sabino</a>
 158   7.6033  0.69871  +0.71333  Promiod
 159  10.5153  0.72065  +0.69115  <a href="http://www.oama.it/">Monte Agliale</a>
-160  10.84144 0.722651 +0.688913 <a href="http://www.castelmartiniastroobservatory.it/index.html">Castelmartini</a>
+160  10.84144 0.722651 +0.688913 <a href="http://www.astrosurf.com/prosperi/LatestObs/">Castelmartini</a>
 161   8.1605  0.70725  +0.70467  Cerrina Tololo Observatory
 162  15.7805  0.75988  +0.64808  Potenza
 163   6.1492  0.65017  +0.75731  Roeser Observatory, Luxembourg
@@ -456,7 +480,7 @@ <h2>List Of Observatory Codes</h2>
 243   9.4130  0.59572  +0.80050  Umbrella Observatory, Fredenbeck
 244   0.00000 0.000000  0.000000 Geocentric Occultation Observation
 245                              <a href="http://www.spitzer.caltech.edu/">Spitzer Space Telescope</a>
-246  14.2881  0.65922  +0.74965  <a href="http://www.klet.org/">Kle&#357; Observatory-KLENOT</a>
+246  14.28476 0.659216 +0.749664 <a href="http://www.klet.org/">Kle&#357; Observatory-KLENOT</a>
 247                              Roving Observer
 248   0.00000 0.000000  0.000000 Hipparcos
 249                              <a href="http://sohowww.nascom.nasa.gov/">SOHO</a>
@@ -477,6 +501,9 @@ <h2>List Of Observatory Codes</h2>
 267 204.53044 0.941705 +0.337234 New Horizons KBO Search-CFHT
 268 289.30803 0.875516 -0.482342 New Horizons KBO Search-Magellan/Clay
 269 289.30914 0.875510 -0.482349 New Horizons KBO Search-Magellan/Baade
+270                              Unistellar Network, Roving Observer
+274                              James Webb Space Telescope
+275                              Non-geocentric Occultation Observation
 276  20.38279 0.608295 +0.791076 P&#322;o{&#324;}sk
 277 356.8175  0.56158  +0.82467  Royal Observatory, Blackford Hill, Edinburgh
 278 116.4494  0.76818  +0.63809  Peking, Transit of Venus site
@@ -489,7 +516,7 @@ <h2>List Of Observatory Codes</h2>
 285   2.3708  0.66135  +0.74759  Flammarion Observatory, Juvisy
 286 102.7883  0.90694  +0.42057  Yunnan Observatory
 290 250.10799 0.842743 +0.537438 Mt. Graham-VATT
-291 248.4009  0.84947  +0.52647  <a href="https://spacewatch.lpl.arizona.edu/telescopes#09meter">LPL/Spacewatch II</a>
+291 248.40024 0.849471 +0.526470 <a href="https://spacewatch.lpl.arizona.edu/telescopes#09meter">LPL/Spacewatch II</a>
 292 285.1058  0.76630  +0.64033  Burlington, New Jersey
 293 285.5899  0.76936  +0.63668  Burlington remote site
 294 285.8467  0.76031  +0.64739  Astrophysical Obs., College of Staten Island
@@ -662,7 +689,7 @@ <h2>List Of Observatory Codes</h2>
 478   3.0896  0.72548  +0.68597  Lamalou-les-Bains
 479   6.0505  0.73020  +0.68096  Sollies-Pont
 480   0.7733  0.61466  +0.78616  Cockfield
-481   7.93    0.596    +0.800    Moorwarfen
+481   7.93067 0.595365 +0.800771 Moorwarfen
 482 357.1854  0.55560  +0.82866  <a href="http://star-www.st-and.ac.uk/">St.&#32;Andrews</a>
 483 173.8036  0.74734  -0.66254  Carter Observatory, Black Birch Station
 484 174.7594  0.75191  -0.65706  Happy Valley, Wellington
@@ -749,15 +776,15 @@ <h2>List Of Observatory Codes</h2>
 565  10.1344  0.70437  +0.70746  <a href="http://www.ulisse.bs.it/osservatorio/index.htm">Bassano Bresciano</a>
 566 203.7424  0.93623  +0.35156  Haleakala-NEAT/GEODSS
 567  12.7117  0.69783  +0.71387  Chions
-568 204.5278  0.94171  +0.33725  <a href="http://www.ifa.hawaii.edu/">Mauna Kea</a>
+568 204.5278  0.94171  +0.33725  <a href="http://www.ifa.hawaii.edu/">Maunakea</a>
 569  24.9587  0.49891  +0.86375  Helsinki
 570  25.2990  0.5794   +0.8123   Vilnius (since 1939)
 571  10.63    0.704    +0.708    Cavriana
 572   6.89    0.631    +0.772    Cologne
 573   9.6612  0.6145   +0.7862   Eldagsen
-574  10.27    0.704    +0.708    Gottolengo
+574  10.2667  0.70463  +0.70721  Gottolengo
 575   6.808   0.68219  +0.72894  <a href="http://obswww.unige.ch/~behrend/page_omg.html">La Chaux de Fonds</a>
-576   0.38    0.631    +0.774    Burwash
+576   0.3760  0.63067  +0.77346  Burwash
 577   7.50    0.678    +0.734    Metzerlen Observatory
 578  27.99    0.898    -0.439    Linden Observatory
 579   8.85    0.711    +0.701    Novi Ligure
@@ -878,7 +905,7 @@ <h2>List Of Observatory Codes</h2>
 694 248.9943  0.84700  +0.53009  Tumamoc Hill, Tucson
 695 248.40533 0.849504 +0.526425 <a href="http://www.noao.edu/kpno/">Kitt Peak</a>
 696 249.1154  0.85205  +0.52249  <a href="http://www.sao.arizona.edu/FLWO/whipple.html">Whipple Observatory, Mt.&#32;Hopkins</a>
-697 248.3842  0.84956  +0.52629  Kitt Peak, McGraw-Hill
+697 248.38381 0.849546 +0.526308 Kitt Peak, McGraw-Hill
 698 249.26736 0.845316 +0.533212 Mt. Bigelow
 699 248.46331 0.819380 +0.571930 <a href="http://asteroid.lowell.edu/asteroid/loneos/loneos.html">Lowell Observatory-LONEOS</a>
 700 250.3817  0.80656  +0.58960  Chinle
@@ -937,7 +964,7 @@ <h2>List Of Observatory Codes</h2>
 753 270.59069 0.731622 +0.679491 <a href="http://www.astro.wisc.edu/Washburn/">Washburn Observatory, Madison</a>
 754 271.4432  0.73762  +0.67303  Yerkes Observatory, Williams Bay
 755 274.6478  0.73353  +0.67743  Optec Observatory
-756 272.3257  0.74361  +0.66641  <a href="http://www.astro.northwestern.edu/observatory.php">Dearborn Observatory, Evanston</a>
+756 272.32567 0.743605 +0.666407 <a href="http://www.astro.northwestern.edu/observatory.php">Dearborn Observatory, Evanston (bef. July~1939)</a>
 757 280.0050  0.8096   +0.5851   High Point
 758 279.2379  0.88044  +0.47257  BCC Observatory, Cocoa
 759 273.1947  0.80946  +0.58530  Nashville
@@ -949,7 +976,7 @@ <h2>List Of Observatory Codes</h2>
 765 275.5775  0.77669  +0.62784  <a href="http://homepages.uc.edu/physics/research/astro.html">Cincinnati</a>
 766 275.5167  0.73600  +0.67477  <a href="http://www.pa.msu.edu/astro/observ/">Michigan State University Obs., East Lansing</a>
 767 276.2697  0.74102  +0.66930  Ann Arbor
-768 272.32500 0.743590 +0.666435 Dearborn Observatory
+768 272.32488 0.743585 +0.666430 Dearborn Observatory, Evanston (aft. Oct.~1939)
 769 276.9892  0.76716  +0.63936  <a href="http://www.phy.ilstu.edu/~wenning/McMillin/McMillin.html">McMillin Observatory, Columbus</a>
 770 274.0786  0.77573  +0.62900  Crescent Moon Observatory, Columbus
 771 277.57    0.922    +0.389    Boyeros Observatory, Havana
@@ -1032,7 +1059,7 @@ <h2>List Of Observatory Codes</h2>
 848 237.0219  0.72412  +0.68741  Tenagra Observatory, Cottage Grove
 849 265.1694  0.77927  +0.62467  Everstar Observatory, Olathe
 850 274.0802  0.81810  +0.57333  <a href="http://www.sewanee.edu/physics/OBSERVATORY/observatory.html">Cordell-Lorenz Observatory, Sewanee</a>
-851 296.4189  0.71284  +0.69900  Burke-Gaffney Observatory, Halifax
+851 296.41962 0.712830 +0.698986 <a href="https://www.ap.smu.ca/pr/bgo">Burke-Gaffney Observatory, Halifax</a>
 852 269.4050  0.7805   +0.6231   River Moss Observatory, St.&#32;Peters
 853 249.1517  0.84365  +0.53544  Biosphere 2 Observatory
 854 249.17995 0.846183 +0.531351 Sabino Canyon Observatory, Tucson
@@ -1051,7 +1078,7 @@ <h2>List Of Observatory Codes</h2>
 867 134.1222  0.81671  +0.57522  Saji Observatory
 868 135.1359  0.83066  +0.55492  Hidaka Observatory
 869 133.4298  0.83480  +0.54870  Tosa
-870 313.17    0.934    -0.359    Campi&#241;as
+870 313.17411 0.921798 -0.386786 Campi&#241;as
 871 134.3925  0.82256  +0.56678  Akou
 872 134.2411  0.82904  +0.55734  <a href="http://www.monterosa.pages.jp/">Tokushima</a>
 873 133.7717  0.82410  +0.56455  Kurashiki Observatory
@@ -1157,7 +1184,7 @@ <h2>List Of Observatory Codes</h2>
 973 359.6671  0.62271  +0.77983  Harrow
 974   8.9220  0.71542  +0.69637  Genoa
 975 359.6333  0.77292  +0.63239  Observatorio Astronomico de Valencia
-976 358.48    0.612    +0.788    Leamington Spa
+976 358.4669  0.61258  +0.78778  Leamington Spa
 977 351.5483  0.58660  +0.80717  Markree
 978 357.24541 0.588685 +0.805673 Conder Brow
 979 358.6697  0.62896  +0.77485  South Wonston
@@ -1258,7 +1285,7 @@ <h2>List Of Observatory Codes</h2>
 A74   8.76240 0.641951 +0.764216 <a href="http://www.bergen-enkheim-observatory.de/">Bergen-Enkheim Observatory</a>
 A75   2.1861  0.75124  +0.65783  Fort Pius Observatory, Barcelona
 A76  20.8356  0.66948  +0.74037  Andromeda Observatory, Miskolc
-A77   5.6475  0.72058  +0.69119  Observatoire Chante-Perdrix, Dauban
+A77   5.64693 0.720583 +0.691196 Observatoire Chante-Perdrix, Dauban
 A78  11.71509 0.730944 +0.680264 <a href="http://giba44.interfree.it/">Stia</a>
 A79  23.84340 0.743686 +0.666622 Zvezdno Obshtestvo Observatory, Plana
 A80  14.1222  0.61408  +0.78662  <a href="http://www.minorplanets.de/A80/">Lindenberg Observatory</a>
@@ -1439,6 +1466,7 @@ <h2>List Of Observatory Codes</h2>
 C55                              Kepler
 C56                              LISA-Pathfinder
 C57                              TESS
+C59                              Yangwang-1
 C60   7.06926 0.634261 +0.770545 Argelander Institute for Astronomy Obs., Bonn
 C61   2.58202 0.658892 +0.749723 Chelles
 C62  11.3467  0.68967  +0.72175  Eurac Observatory, Bolzano
@@ -1494,10 +1522,11 @@ <h2>List Of Observatory Codes</h2>
 D12  11.33806 0.690580 +0.720900 Filzi School Observatory, Laives
 D13  11.56369 0.738665 +0.671859 Cat's Eye Observatory
 D14 113.3231  0.92000  +0.39061  Nanchuan Observatory, Guangzhou
+D15  11.31781 0.630848 +0.773359 Sternwarte F.Schiller-Gymnasium, Weimar
 D16 113.96422 0.925155 +0.378330 Po Leung Kuk Observatory, Tuen Mun
 D17 114.2200  0.9245   +0.3799   Hong Kong
 D18 114.3580  0.86219  +0.50490  Mt.&#32;Guizi Observatory
-D19 114.32300 0.924955 +0.378843 Hong Kong Space Museum, Tsimshatsui
+D19 114.32300 0.924955 +0.378843 <a href="https://hk.space.museum">Hong Kong Space Museum Sai Kung iObservatory</a>
 D20 115.71311 0.854733 -0.517343 Zadko Observatory, Wallingup Plain
 D21 115.8150  0.8492   -0.5263   <a href="http://jazzistentialism.com/blog">Shenton Park</a>
 D22 115.81667 0.849044 -0.526558 UWA Observatory, Crawley
@@ -1549,7 +1578,7 @@ <h2>List Of Observatory Codes</h2>
 E07 148.99889 0.820544 -0.569830 Murrumbateman
 E08 149.33431 0.855971 -0.515472 Wobblesock Observatory, Coonabarabran
 E09 149.0814  0.85551  -0.51630  <a href="http://www.rose-hulman.edu/Users/groups/Observatory/events.htm">Oakley Southern Sky Observatory, Coonabarabran</a>
-E10 149.07028 0.855623 -0.516200 Siding Spring-Faulkes Telescope South
+E10 149.07085 0.855632 -0.516198 Siding Spring-Faulkes Telescope South
 E11 149.6627  0.84469  -0.53362  <a href="http://my.hwy.com.au/~sjquirk/">Frog Rock Observatory, Mudgee</a>
 E12 149.0642  0.85563  -0.51621  Siding Spring Survey
 E13 149.0969  0.81622  -0.57597  <a href="http://members.pcug.org.au/~vello/">Wanniassa</a>
@@ -1567,7 +1596,7 @@ <h2>List Of Observatory Codes</h2>
 E25 153.1170  0.88713  -0.45997  Rochedale (APTA)
 E26 153.3971  0.88414  -0.46566  <a href="http://www.global-rent-a-scope.com/">RAS Observatory, Biggera Waters</a>
 E27 153.2667  0.8871   -0.4600   Thornlands
-E28 150.6411  0.83319  -0.55121  Kuriwa Observatory, Hawkesbury Heights
+E28 150.64105 0.833196 -0.551210 Kuriwa Observatory, Hawkesbury Heights
 E81 173.2617  0.75267  -0.65622  Nelson
 E83 173.95703 0.749648 -0.659621 Wither Observatory, Witherlea
 E85 174.89400 0.800696 -0.597064 Farm Cove
@@ -1578,10 +1607,16 @@ <h2>List Of Observatory Codes</h2>
 F52 203.74409 0.936239 +0.351545 Pan-STARRS 2, Haleakala
 F59 201.94100 0.932037 +0.361160 Ironwood Remote Observatory, Hawaii
 F60 201.95283 0.929942 +0.366558 Ironwood Observatory, Hawaii
-F65 203.7424  0.93624  +0.35154  Haleakala-Faulkes Telescope North
+F65 203.74250 0.936239 +0.351538 Haleakala-Faulkes Telescope North
 F84 210.3842  0.95330  -0.30100  Hibiscus Observatory, Punaauia
 F85 210.3842  0.95330  -0.30100  Tiki Observatory, Punaauia
 F86 210.38381 0.953304 -0.301004 Moana Observatory, Punaauia
+G00  15.12600 0.665508 +0.744080 AZM Martinsberg, Oed
+G01   8.16528 0.600977 +0.796597 Universitaetssternwarte Oldenburg
+G02  18.76539 0.653307 +0.754650 KYSUCE Observatory, Kysucke Nove Mesto
+G03  18.26061 0.678620 +0.732104 Capricornus Observatory, Csokako
+G04   7.14133 0.627502 +0.776082 Schuelerlabor Astronomie St.&#32;7, Wuppertal
+G05 354.53363 0.787181 +0.614802 Piconcillo, Sierra Morena
 G06   4.67150 0.619980 +0.781996 Dordrecht, Sterrenburg
 G07   3.06386 0.719394 +0.692378 Millau Observatory
 G08   1.99694 0.748752 +0.660794 Observatorio Les Pedritxes, Matadepera
@@ -1590,9 +1625,11 @@ <h2>List Of Observatory Codes</h2>
 G11   7.18379 0.630712 +0.773465 Breitenweg Observatory, Herkenrath
 G12   8.3306  0.62140  +0.78090  Sternwarte EG, Lippstadt
 G13   9.77169 0.451874 +0.889103 Astronomihagen, Fannrem
+G14   7.00520 0.725247 +0.686239 Novaloop Observatory, Mougins
+G15   9.1183  0.71116  +0.70080  Magroforte Observatory, Alessandria
 G16  13.34869 0.787948 +0.613701 OmegaLab Observatory, Palermo
 G17  11.20261 0.723508 +0.688023 BAS Observatory, Scandicci
-G18  11.26383 0.712881 +0.698948 ALMO Observatory, Padulle
+G18  11.28056 0.712881 +0.698947 ALMO Observatory, Padulle
 G19  12.7460  0.63252  +0.77202  Immanuel Kant Observatory,Limbach
 G20   6.05989 0.727743 +0.683615 Brignoles Observatory
 G21  13.73789 0.796024 +0.603377 Osservatorio Castrofilippo
@@ -1656,7 +1693,7 @@ <h2>List Of Observatory Codes</h2>
 G79 243.6165  0.82718  +0.56030  Goat Mountain Astronomical Research Station
 G80 240.5873  0.79904  +0.59962  Sierra Remote Observatories, Auberry
 G81 242.91300 0.834904 +0.548639 Temecula
-G82 248.40025 0.849488 +0.526449 SARA Observatory, Kitt Peak
+G82 248.40057 0.849482 +0.526455 SARA Observatory, Kitt Peak
 G83 250.11039 0.842740 +0.537440 <a href="http://www.lbto.org/">Mt. Graham-LBT</a>
 G84 249.21084 0.845112 +0.533610 Mount Lemmon SkyCenter
 G85 247.56518 0.799502 +0.599067 Vermillion Cliffs Observatory, Kanab
@@ -1796,7 +1833,7 @@ <h2>List Of Observatory Codes</h2>
 I19 295.40711 0.854834 -0.517422 <a href="http://www.aoacm.com.ar/">Observatorio El Gato Gris, Tanti</a>
 I20 295.68161 0.838551 -0.543122 <a href="http://astrosurf.com/salvador/">Observatorio Astronomico Salvador, R&#237;o Cuarto</a>
 I21 295.8281  0.85465  -0.51760  El Condor Observatory, C&#243;rdoba
-I22 296.1740  0.71212  +0.69973  Abbey Ridge Observatory, Stillwater Lake
+I22 296.17399 0.712120 +0.699724 <a href="https://abbeyridgeobservatory.ca/">Abbey Ridge Observatory, Stillwater Lake</a>
 I23 292.26649 0.714173 +0.697623 Frosty Cold Observatory, Mash Harbor
 I24 282.2306  0.78534  +0.61702  Lake of the Woods Observatory, Locust Grove
 I25 295.44381 0.850887 -0.523945 ECCCO Observatory, Bosque Alegre
@@ -1887,7 +1924,7 @@ <h2>List Of Observatory Codes</h2>
 J10 359.59839 0.784437 +0.618151 Alicante
 J11 351.31769 0.746984 +0.662617 Matosinhos
 J12 356.51061 0.758248 +0.649949 <a href="http://www.miguelmuro.com">Caraquiz</a>
-J13 342.1208  0.87763  +0.47851  La Palma-Liverpool Telescope
+J13 342.1208  0.87763  +0.47851  <a href="https://telescope.livjm.ac.uk/">La Palma-Liverpool Telescope</a>
 J14 345.99281 0.880303 +0.472891 La Corte
 J15 352.83061 0.755420 +0.653125 Muxagata
 J16 354.20356 0.584292 +0.808826 An Carraig Observatory, Loughinisland
@@ -1912,7 +1949,7 @@ <h2>List Of Observatory Codes</h2>
 J35 356.02911 0.792167 +0.608432 Tucci Observatory, Martos
 J36 356.94519 0.765179 +0.641659 Observatorio DiezALaOnce, Illana
 J37 353.06469 0.796893 +0.602104 Huelva
-J38 353.60890 0.726876 +0.684507 <a href="http://www.elobservatoriu.com">Observatorio La Vara, Vald&#233;s</a>
+J38 353.60924 0.726887 +0.684518 <a href="http://www.elobservatoriu.com">Observatorio La Vara, Vald&#233;s</a>
 J39 344.5636  0.88429  +0.46547  Ingenio
 J40 355.55847 0.802546 +0.594601 M&#225;laga
 J41 353.8189  0.59779  +0.79897  <a href="http://www.webtreatz.com/">Raheny</a>
@@ -1931,7 +1968,7 @@ <h2>List Of Observatory Codes</h2>
 J54 343.4906  0.88149  +0.47142  <a href="http://www.telescope.org/">Bradford Robotic Telescope</a>
 J55 344.3144  0.88549  +0.46313  Los Altos de Arguineguin Observatory
 J56 344.4536  0.88416  +0.46624  Observatorio La Avejerilla
-J57 358.89089 0.767817 +0.638833 Centro Astron&#243;mico Alto Turia, Valencia
+J57 358.89089 0.767817 +0.638833 <a href="https://astroava.org/observatorio/presentacion.html">Centro Astron&#243;mico Alto Turia, Valencia</a>
 J58 356.6644  0.62304  +0.77959  Brynllefrith Observatory, Llantwit Fardre
 J59 356.20256 0.726956 +0.684386 <a href="http://www.astrosurf.com/linceot/">Observatorio Linceo, Santander</a>
 J60 354.3406  0.74773  +0.66201  Tocororo Observatory, Arquillinos
@@ -1955,7 +1992,7 @@ <h2>List Of Observatory Codes</h2>
 J78 358.8244  0.78887  +0.61253  <a href="http://www.elcaracas.com/">Murcia</a>
 J79 358.38066 0.795516 +0.603908 Observatorio Calarreona, Aguilas
 J80 359.1083  0.70862  +0.70323  Sainte Helene
-J81 358.1350  0.7360   +0.6749   Guirguillano
+J81 358.13489 0.735984 +0.674878 Guirguillano
 J82 357.3067  0.5935   +0.8021   Leyland
 J83 357.3883  0.59274  +0.80270  Olive Farm Observatory, Hoghton
 J84 358.9803  0.63144  +0.77285  <a href="http://www.hantsastro.org.uk/">South Observatory, Clanfield</a>
@@ -1974,6 +2011,7 @@ <h2>List Of Observatory Codes</h2>
 J97 359.5333  0.7754   +0.6293   Alginet
 J98 359.5344  0.77275  +0.63259  Observatorio Manises
 J99 359.57808 0.772589 +0.632790 Burjassot
+K00   8.94836 0.642630 +0.763639 Hanau
 K01   0.62091 0.618636 +0.783060 Astrognosis Observatory, Bradwell
 K02   0.66761 0.622858 +0.779718 Eastwood Observatory, Leigh on Sea
 K03   0.74411 0.744133 +0.665979 Observatori AAS Montsec
@@ -2072,7 +2110,7 @@ <h2>List Of Observatory Codes</h2>
 K96  16.75119 0.774870 +0.630302 Savelli Observatory
 K97   7.18026 0.664361 +0.745050 Freconrupt
 K98  17.07217 0.608205 +0.791142 6ROADS Observatory 1, Wojnowko
-K99  22.45350 0.663064 +0.746102 ISON-Uzhgorod Observatory
+K99  22.45350 0.663064 +0.746102 Derenivka Observatory
 L00  12.5375  0.74535  +0.66446  East Rome Observatory, Rome
 L01  13.74930 0.704742 +0.707169 Vi&#353;njan Observatory, Tican
 L02  20.81658 0.771051 +0.634781 NOAK Observatory, Stavraki
@@ -2121,7 +2159,7 @@ <h2>List Of Observatory Codes</h2>
 L45  15.06243 0.793975 +0.605979 ObsCT, Catania
 L46 356.11939 0.762017 +0.645574 Observatorio Majadahonda
 L47  12.50711 0.725542 +0.685961 Osservatorio Astronomico, Piobbico
-L48  23.56873 0.674816 +0.735566 Baia Mare
+L48  23.56873 0.674816 +0.735566 CNVL Observatory, Baia Mare
 L49  13.00730 0.671444 +0.738747 VEGA-Sternwarte, Dorfleiten
 L50  34.0114  0.71157  +0.70039  GenShtab Observatory, Nauchnij
 L51  34.0164  0.71169  +0.70028  MARGO, Nauchnij
@@ -2160,14 +2198,51 @@ <h2>List Of Observatory Codes</h2>
 L84  41.27989 0.695443 +0.716182 Kairos Observatory, Letnik
 L85  15.86325 0.766873 +0.639830 BiAnto Observatory, Lauria
 L86   9.2631  0.71140  +0.70062  Giordano Bruno Observatory, Brallo
-L87  16.36189 0.919631 -0.392204 Moonbase South Observatory, Hakos
+L87  16.36189 0.919631 -0.392204 <a href="https://sites.google.com/view/moonbasesouth/home">Moonbase South Observatory, Hakos</a>
 L88  16.5422  0.77721  +0.62746  Stazione Astronomica Le Pleiadi, Pantane
+L89  11.14439 0.722146 +0.689445 PAO, Prato
+L90  15.97949 0.784120 +0.618560 ABObservatory, Rosarno
+L91  13.8078  0.74776  +0.66189  Antares MTM Observatory, S. Donato
+L92  16.00211 0.781423 +0.621967 San Costantino
 L93   1.77221 0.752844 +0.65601  Garraf Observatory, Sant Pere de Ribes
 L94 354.14561 0.728187 +0.683146 Observatorio MOMA, Oviedo
 L95 358.95159 0.793164 +0.607000 Observatorio Astronomico de Cartagena
 L96  44.2745  0.76340  +0.64416  ISON-Byurakan Observatory
 L97 357.99161 0.624666 +0.778298 Castle Fields Observatory, Calne
 L98 357.43425 0.789394 +0.612232 La Sagra Observatory, Puebla de Don Fadrique
+L99  30.60281 0.635913 +0.769201 Novoselki
+M02   0.86386 0.754439 +0.654271 Astropriorat Observatory
+M03   2.25822 0.750568 +0.658591 Badalona Boreal
+M04   1.4256  0.74764  +0.66207  Pujalt Observatory, Barcelona
+M09   5.60094 0.630164 +0.773882 Observatory Gromme - Oudsbergen
+M10   6.85411 0.724305 +0.687343 CPF Observatory, St Vallier de Thiey
+M11   5.64718 0.720589 +0.691192 Novaastro Observatory, Banon
+M15   9.1506  0.70039  +0.71142  Virgo Oservatory, Seveso
+M16   9.77319 0.719401 +0.692358 Osservatorio Il Coreggiolo
+M17   9.80922 0.719163 +0.692525 SN1572 Tycho Observatory, La Spezia
+M18  11.83939 0.639618 +0.766239 Koeditz
+M19  13.88327 0.709976 +0.701881 Osservatorio Explorer, Pula
+M20  13.01169 0.690044 +0.721515 Polse di Cougnes Observatory, Zuglio
+M21  16.36144 0.919630 -0.392206 Schiaparelli Southern Observatory, Hakos
+M22  20.81059 0.845564 -0.532612 ATLAS South Africa, Sutherland
+M23  16.60350 0.679955 +0.730852 ELTE Gothard Observatory, Szombathely
+M24  16.20050 0.787195 +0.614649 Ardore Marina
+M25  23.8283  0.47849  +0.87517  Einarin Observatory, Tampere
+M26  11.13494 0.723236 +0.688304 Zen Observatory, Scandicci
+M27  10.7175  0.72743  +0.68399  Elijah Observatory, Lajatico
+M28  20.81064 0.845568 -0.532607 Lesedi Telescope-SAAO Observatory, Sutherland
+M29  12.24864 0.718724 +0.692984 O.M.Ni.A. Observatory, Cesena
+M30  25.62000 0.700380 +0.711516 Zeta Aquarii Observatory, Brasov
+M31  26.21281 0.490130 +0.868745 Ursa Havaintokeskus,  Artjarvi
+M32  22.70919 0.665464 +0.743964 Sunny Transcarpathian, Mukachevo
+M33  34.76334 0.861632 +0.506111 OWL-Net, Mitzpe Ramon
+M34  17.27363 0.665591 +0.743936 AGO70, Astronomical Observatory, Modra
+M35  26.61669 0.688654 +0.722734 PS Observatory, Parjol
+M36  13.79647 0.699732 +0.712090 Opicina, Trieste
+M37  13.91243 0.696956 +0.714892 Astronomsko drustvo Nanos, Ajdovscina
+M39  22.95888 0.760013 +0.647750 AUTH Observatory, Thessaloniki
+M40  31.82708 0.867372 +0.496143 OSTS-NRIAG, Kottamia
+M41  39.25827 0.930706 +0.364567 Jeddah
 M42  54.6708  0.90990  +0.41343  Emirates Observatory, Al Rahba
 M43  54.68478 0.912805 +0.407034 Al Sadeem Observatory, Abu Dhabi
 M44  54.92031 0.912502 +0.407722 Al-Khatim Observatory, Abu Dhabi
@@ -2179,38 +2254,57 @@ <h2>List Of Observatory Codes</h2>
 N31  74.44422 0.853321 +0.519690 Eden Astronomical Observatory, Lahore
 N42  76.97181 0.732126 +0.679511 Tien-Shan Astronomical Observatory
 N43  77.1167  0.16712  -0.98328  Plateau Observatory for Dome A, Kunlun Station
+N44  77.13931 0.785023 +0.617693 Shache Station, Langan Village
 N50  78.96383 0.842176 +0.538692 Himalayan Chandra Telescope, IAO, Hanle
 N51  78.96461 0.842178 +0.538687 GROWTH India Telescope, IAO, Hanle
-N55  80.02623 0.846497 +0.532089 Corona Borealis Observatory, Ngari
-N56  80.02675 0.846503 +0.532073 Zijinshan-Beimian Survey, Ali
+N55  80.02623 0.846497 +0.532089 Beimian Tianwentai, Ali, Tibet
+N56  80.02675 0.846503 +0.532073 Jiama'erdeng Tianwentai, Ali, Tibet
+N82  85.95494 0.641844 +0.764450 Multa Observatory
+N83  86.23504 0.749549 +0.659927 LW-1, NAOC-Korla
+N86  87.17852 0.727070 +0.684719 Xingming Observatory-KATS, Nanshan
 N87  87.17503 0.727076 +0.684720 Nanshan Station, Xinjiang Observatory
-N88  87.17322 0.727098 +0.684697 Xingming Observatory #3, Nanshan
-N89  87.17906 0.727107 +0.684682 Xingming Observatory #2, Nanshan
+N88  87.17322 0.727098 +0.684697 Xingming Observatory {#}3, Nanshan
+N89  87.17906 0.727107 +0.684682 Xingming Observatory {#}2, Nanshan
 O02  90.52614 0.866434 +0.498958 Galaxy Tibet YBJ Observatory,Yangbajing
+O17  93.88669 0.783127 +0.620730 Purple Mountain Observatory, Lenghu-1
 O37  98.48553 0.948521 +0.316891 TRT-NEO, Chiangmai
 O43  99.78111 0.994005 +0.109127 Observatori Negara, Langkawi
 O44 100.0310  0.89435  +0.44698  Lijiang Station, Yunnan Observatories
 O45 100.03261 0.894444 +0.446808 Yunnan-HK Observatory, Gaomeigu
+O47 101.13415 0.902535 +0.429998 Yunling Observatory, Yunnan
+O48 101.18154 0.903223 +0.428442 Purple Mountain Observatory, Yaoan (0.8-m)
 O49 101.18111 0.903206 +0.428474 Purple Mountain Observatory, Yaoan Station
 O50 101.43942 0.998617 +0.052565 Hin Hua Observatory, Klang
+O51 101.27869 0.975556 +0.218996 Akin Observatory, Rayong
+O68 105.33090 0.793121 +0.607347 LW-2, NAOC-Zhongwei
+O72 106.33476 0.672017 +0.738399 OWL-Net, Songino
 O75 107.05180 0.672284 +0.738151 ISON-Hureltogoot Observatory
 O85 109.21300 0.826583 +0.561181 LiShan Observatory, Lintong
+P07 114.08987 0.928304 -0.370597 Space Surveillance Telescope, HEH Station
 P18 116.61083 0.757010 +0.651328 Birch Forest Observatory, LaBaGouMen
+P22 117.57588 0.762782 +0.644702 LW-3, NAOC-Xinglong
 P25 118.31274 0.910976 +0.411089 Kinmen Educational Remote Observatory, Jincheng
 P30 119.59708 0.862775 +0.504181 Jiangnantianchi Observatory, Anji
 P31 119.59736 0.862772 +0.504189 Starlight Observatory, Tianhuangping
 P34 120.32031 0.855040 +0.516826 Lvye Observatory, Suzhou
 P35 120.55699 0.913398 +0.405722 Cuteip Remote Observatory, Changhua
 P36 120.62669 0.855207 +0.516553 ULTRA Observatory,Suzhou
+P37 120.63972 0.912980 +0.406672 HuiWen High School Observatory, Taichung City
 P40 121.53958 0.905916 +0.422185 Chinese Culture University, Taipei
+P48 123.32403 0.258064 -0.963413 ASTEP, Concordia Station
 P64 127.00489 0.796371 +0.602805 GSHS Observatory, Suwon
+P65 127.37568 0.805889 +0.590124 OWL-Net, Daedeok
 P66 127.44675 0.824763 +0.563603 Deokheung Optical Astronomy Observatory
 P67 127.7415  0.79040  +0.61057  Kangwon National University Observatory
+P71 128.76108 0.815026 +0.577520 Miryang Arirang Astronomical Observatory
+P72 128.97595 0.808423 +0.586939 OWL-Net, Mt.&#32;Bohyun
 P73 129.0820  0.81744  +0.57412  BSH Byulsem Observatory, Busan
 P87 132.09419 0.830358 +0.555374 Hirao Observatory, Yamaguchi
 P93 133.54433 0.823371 +0.565729 Space Tracking and Communications Center, JAXA
 Q02 135.49344 0.825315 +0.562809 Sakai Observatory, Osaka
+Q10 137.32944 0.821623 +0.568142 Toyokawa Observatory
 Q11 137.52069 0.820236 +0.570158 Shinshiro
+Q12 137.82536 0.805147 +0.591292 Nagano Observatory
 Q19 139.4390  0.81430  +0.57852  Machida
 Q21 139.85335 0.804747 +0.591654 Southern Utsunomiya
 Q23 140.3864  0.79654  +0.60264  Sukagawa
@@ -2218,6 +2312,7 @@ <h2>List Of Observatory Codes</h2>
 Q33 142.48278 0.715989 +0.695814 Nayoro Observatory, Hokkaido University
 Q38 143.5506  0.81654  -0.57538  Swan Hill
 Q54 147.28772 0.739290 -0.671278 Harlingten Telescope, Greenhill Observatory
+Q55 149.06142 0.855643 -0.516191 SkyMapper, Siding Spring
 Q56 148.97642 0.821480 -0.568478 Heaven's Mirror Observatory, Yass
 Q57 149.06173 0.855649 -0.516175 Korea Microlensing Telescope Network-SSO
 Q58 149.07085 0.855632 -0.516199 Siding Spring-LCO Clamshell {#}1
@@ -2236,17 +2331,26 @@ <h2>List Of Observatory Codes</h2>
 Q78 152.94789 0.886807 -0.460619 Woogaroo Observatory, Forest Lake
 Q79 152.8481  0.88871  -0.45696  Samford Valley Observatory
 Q80 153.2160  0.88762  -0.45904  Birkdale
+Q81 153.09622 0.893194 -0.448181 Caloundra West
 R57 170.47278 0.720489 -0.691309 Aorangi Iti Observatory, Lake Tekapo
 R58 170.49039 0.697579 -0.714138 Beverly-Begg Observatory, Dunedin
+R65 172.34981 0.726556 -0.684830 R. F. Joyce Observatory, Christchurch
+R66 172.58761 0.726587 -0.684777 Mooray Observatory, Christchurch
 T03 203.74247 0.936240 +0.351538 Haleakala-LCO Clamshell {#}3
 T04 203.74249 0.936241 +0.351538 Haleakala-LCO OGG B {#}2
 T05 203.74299 0.936235 +0.351547 ATLAS-HKO, Haleakala
 T07 204.42387 0.943290 +0.332467 ATLAS-MLO Auxiliary Camera, Mauna Loa
 T08 204.42395 0.943290 +0.332467 ATLAS-MLO, Mauna Loa
-T09 204.52398 0.941706 +0.337237 Mauna Kea-UH/Tholen NEO Follow-Up (Subaru)
-T10 204.52241 0.941706 +0.337212 Submillimeter Array, Mauna Kea (SMA)
-T12 204.53057 0.941729 +0.337199 Mauna Kea-UH/Tholen NEO Follow-Up (2.24-m)
-T14 204.53113 0.941714 +0.337236 Mauna Kea-UH/Tholen NEO Follow-Up (CFHT)
+T09 204.52398 0.941706 +0.337237 Subaru Telescope, Maunakea
+T10 204.52241 0.941706 +0.337212 Submillimeter Array, Maunakea (SMA)
+T11 204.53036 0.941731 +0.337198 United Kingdom Infrared Telescope, Maunakea
+T12 204.53057 0.941729 +0.337199 University of Hawaii 88-inch telescope, Maunakea
+T13 204.52771 0.941691 +0.337263 NASA Infrared Telescope Facility, Maunakea
+T14 204.53113 0.941714 +0.337236 Canada-France-Hawaii Telescope, Maunakea
+T15 204.53094 0.941727 +0.337214 Gemini North Observatory, Maunakea
+T16 204.52570 0.941703 +0.337250 W. M. Keck Observatory, Keck 1, Maunakea
+T17 204.52580 0.941700 +0.337256 W. M. Keck Observatory, Keck 2, Maunakea
+U52 237.45111 0.749240 +0.660270 Shasta Valley Observatory, Grenada
 U53 237.1603  0.70274  +0.70909  Murray Hill Observatory, Beaverton
 U54 237.31286 0.782952 +0.620081 Hume Observatory, Santa Rosa
 U55 237.41456 0.653977 +0.753984 Golden Ears Observatory, Maple Ridge
@@ -2262,7 +2366,9 @@ <h2>List Of Observatory Codes</h2>
 U71 241.3633  0.82520  +0.56305  AHS Observatory, Castaic
 U72 241.46000 0.828150 +0.558687 Tarzana
 U73 241.6172  0.83164  +0.55346  Redondo Beach
-U76 242.1279  0.82855  +0.55810  Glendora
+U74 240.58720 0.799040 +0.599619 JPL SynTrack Robotic Telescope 2, Auberry
+U75 242.18366 0.833735 +0.550383 Newport Beach
+U76 242.1279  0.82855  +0.55810  Maury Lewin Observatory, Glendora
 U77 242.9181  0.84002  +0.54076  Rani Observatory, San Diego
 U78 242.8449  0.82758  +0.55989  Cedar Glen Observatory
 U79 242.79187 0.838837 +0.542598 Cosmos Research Center, Encinitas
@@ -2271,6 +2377,8 @@ <h2>List Of Observatory Codes</h2>
 U82 243.61519 0.827368 +0.560036 CS3-Palmer Divide Station, Landers
 U83 243.57311 0.841238 +0.53938  Mount Laguna Observatory
 U96 246.68600 0.579007 +0.812698 Athabasca University Geophysical Observatory
+U97 248.33292 0.818306 +0.573452 JPL SynTrack Robotic Telescope 3, Flagstaff
+U98 249.74300 0.849529 +0.526090 NAC Observatory, Benson
 V00 248.39981 0.849456 +0.526492 Kitt Peak-Bok
 V01 248.23911 0.762243 +0.645493 Mountainville Observatory, Alpine
 V02 248.05794 0.835743 +0.547377 Command Module, Tempe
@@ -2286,26 +2394,39 @@ <h2>List Of Observatory Codes</h2>
 V12 249.39819 0.852110 +0.522050 Elgin
 V13 248.78278 0.762335 +0.645641 Little Moose Observatory, Timber Lakes
 V14 248.78336 0.762292 +0.645691 Moose Springs Observatory, Timber Lakes
+V15 249.21069 0.845110 +0.533602 OWL-Net, Mt.&#32;Lemmon
 V16 251.10288 0.849510 +0.526194 Dark Sky New Mexico, Animas
+V17 248.98319 0.845476 +0.532429 Leo Observatory, Tucson
+V18 249.6181  0.85776  +0.51308  MASTER-OAGH Observatory, Sonora
 V19 251.79086 0.841371 +0.539217 Whiskey Creek Observatory
 V20 251.77822 0.827004 +0.560943 Killer Rocks Observatory, Pie Town
+V21 251.10231 0.849511 +0.526188 Cewanee Observatory at DSNM
+V22 251.81550 0.827009 +0.560941 Insight Remote Observatory, Pie Town
 V23 252.76406 0.828722 +0.558332 FOAH Observatory, Magdalena
 V26 253.39020 0.911283 +0.410639 UAS-ISON Observatory, Cosala
+V27 253.71819 0.811354 +0.583180 North Mesa Observatory, Los Alamos
 V28 254.34647 0.817018 +0.575271 Deep Sky West Observatory, Rowe
 V29 254.26660 0.840062 +0.541466 Tzec Maun Cloudcroft Facility
 V30 254.47105 0.840710 +0.540313 Heaven on Earth Observatory, Mayhill
 V31 254.4750  0.84061  +0.54046  Hazardous Observatory, Mayhill
 V32 254.47131 0.840709 +0.540308 Canvas View New Mexico Skies, Mayhill
+V33 254.72039 0.806382 +0.590114 Finlaystone Observatory, Angel Fire
 V34 255.36992 0.778401 +0.626222 Black Forest
 V35 255.91881 0.861839 +0.506046 Deep Sky Observatory Collaborative, Pier 5
 V36 255.61742 0.843042 +0.536333 The Ranch Observatory, Lakewood
 V37 255.98483 0.861053 +0.507428 McDonald Observatory-LCO ELP
 V38 255.98493 0.861051 +0.507431 McDonald Observatory-LCO ELP Aqawan A {#}1
 V39 255.98452 0.861051 +0.507430 McDonald Observatory-LCO ELP B
+V40 255.91873 0.861839 +0.506046 Divine Creation Observatory, Fort Davis
+V41 256.72578 0.719992 +0.691890 Rapid City
+V58 260.73497 0.868735 +0.493762 Medina Dome, Medina
 V59 261.0734  0.86642  +0.49781  Millwood Observatory, Comfort
 V60 261.09473 0.862140 +0.505126 Putman Mountain Observatory
 V61 261.05710 0.858216 +0.511725 Shed of Science South, Pontotoc
+V62 261.05661 0.858216 +0.511726 Live Oak Observatory, Pontotoc
+V63 261.05728 0.858219 +0.511721 Tara Observatory, Cherokee
 V70 263.33572 0.870056 +0.491332 Starry Night Observatory, Columbus
+V72 263.89011 0.752696 +0.656235 JDP Observatory, Omaha
 V74 264.15689 0.869320 +0.492598 Katy Observatory, Katy
 V78 265.10780 0.700141 +0.711688 Spirit Marsh Observatory. Sauk Centre
 V81 265.7604  0.80902  +0.58590  Fayetteville
@@ -2316,29 +2437,48 @@ <h2>List Of Observatory Codes</h2>
 V94 268.66169 0.759876 +0.647933 Cherokeeridge Observatory, Fort Madison
 W04 271.00944 0.761606 +0.645927 Mark Evans Observatory, Bloomington
 W08 271.88331 0.747086 +0.662545 Jimginny Observatory, Naperville
+W09 272.14753 0.752886 +0.655985 Willowed Plains Observatory, Manteno
 W11 272.6247  0.75272  +0.65618  Northwest Indiana Robotic Telescope, Lowell
 W14 273.24511 0.821914 +0.567774 Harvest
+W15 273.19083 0.810875 +0.583314 Wayne Observatory, Franklin
 W16 273.76869 0.822976 +0.566292 Pleasant Groves Observatory
+W18 274.24962 0.767039 +0.639505 Red Fox Observatory, Pendleton
 W19 274.37283 0.740783 +0.669559 Kalamazoo
 W22 275.00447 0.844595 +0.533635 WestRock Observatory, Columbus
+W23 275.38019 0.772786 +0.632594 Hevonen Farm Observatory, Oxford
+W24 275.23817 0.722574 +0.689025 <a href="https://www.youtube.com/c/CommonSenseScience">Shamrock Banks Observatory, Clare</a>
 W25 275.63506 0.776417 +0.628165 <a href="http://www.rmsobservatory.org/">RMS Observatory, Cincinnati</a>
 W28 276.3883  0.83011  +0.55581  Ex Nihilo Observatory, Winder
+W29 276.9939  0.76659  +0.64004  Adena Brook Observatory, Columbus
 W30 276.77117 0.838735 +0.542749 Georgia College Observatory, Milledgeville
 W31 277.23736 0.834226 +0.549613 Deerlick Observatory, Crawfordville
 W32 277.23750 0.834222 +0.549619 Crawfordville Observatory
 W33 277.83451 0.819315 +0.571499 Transit Dreams Observatory, Campobello
 W34 277.8453  0.81784  +0.57360  <a href="http://svo.space">Squirrel Valley Observatory, Columbus</a>
+W35 278.03910 0.856610 +0.514230 Buffalo Creek Observatory, Nahunta
 W38 278.58531 0.807479 +0.588163 Dark Sky Observatory, Boone
+W42 279.46569 0.885511 +0.463056 <a href="https://www.mindseyeobservatory.org/">Mind's Eye Observatory, Vero Beach</a>
 W46 280.41192 0.818614 +0.572448 Foxfire Village
+W48 280.88700 0.811693 +0.582156 BKH Observatory, Chapel Hill
 W49 281.06757 0.778794 +0.625380 CBA-MM Observatory, Mountain Meadows
 W50 281.25404 0.813127 +0.580167 Apex
+W53 282.31524 0.771140 +0.634559 Hagerstown
 W54 282.28944 0.785431 +0.616890 Mark Slade Remote Observatory, Wilderness
 W55 282.58389 0.773703 +0.631447 Natelli Observatory, Frederick
+W56 282.52583 0.773143 +0.632153 Pineapple Observatory, Frederick
+W57 289.26094 0.873480 -0.486002 ESA TBT La Silla Observatory
+W58 283.14964 0.777667 +0.626574 ALPHA Observatory, South Laurel
+W59 284.10758 0.757005 +0.651302 The Dark Side Observatory, Weatherly
+W60 286.36626 0.995574 +0.097155 AstroExplor Observatory, Tinjaca
 W61 283.74492 0.713380 +0.698447 Leeside Observatory, Elgin
+W62 284.13761 0.758729 +0.649276 Comet Hunter Observatory2, New Ringgold
 W63 284.30958 0.996767 +0.082976 Observatorio Astronomico UTP, Pereira
+W64 285.27004 0.768364 +0.637863 Red Lion Observatory, Southampton Twsp
 W65 284.79169 0.697761 +0.713966 Observatoire GOZ, Montpellier
 W66 285.05381 0.756278 +0.652109 SVH Observatory, Blairstown
 W67 285.10211 0.759453 +0.648444 Paul Robinson Observatory, Voorhees State Park
+W68 289.23502 0.862845 -0.504269 ATLAS Chile, Rio Hurtado
+W69 285.98500 0.759912 +0.647855 OLPH Observatory, Brooklyn
 W70 285.91386 0.698475 +0.713264 Loose Goose Observatory, Saint-J&#233;rome
 W71 285.99297 0.717404 +0.694456 Rand II Observatory, Lake Placid
 W72 286.8211  0.75302  +0.65580  Trumbull Observatory, Trumbull
@@ -2371,29 +2511,42 @@ <h2>List Of Observatory Codes</h2>
 W99 291.82015 0.921638 -0.387716 SON, San Pedro de Atacama Station
 X00 292.60125 0.910349 -0.413802 Observatorio Astronomico Tolar
 X01 289.23502 0.862846 -0.504270 Observatory Hurtado, El Sauce
-X02 289.23517 0.862833 -0.504255 Telescope Live, El Sauce
+X02 289.23517 0.862833 -0.504255 <a href="https://telescope.live/">Telescope Live, El Sauce</a>
 X03 289.20361 0.862286 -0.505209 Observatoire SADR, Poroto
+X04 291.56747 0.664264 +0.745000 MCD Observatory, Saint-Anaclet
+X05 289.25058 0.864981 -0.500958 <a href="https://rubinobservatory.org/">Simonyi Survey Telescope, Rubin Observatory</a>
 X12 295.71200 0.803430 -0.593455 Observatorio Los Cabezones
 X13 295.4498  0.85269  -0.52103  Observatorio Remoto Bosque Alegre
 X14 295.83222 0.854475 -0.517879 <a href="http://observatorioorbistertius.blogspot.com.ar/">Observatorio Orbis Tertius, C&#243;rdoba</a>
 X31 299.47934 0.850485 -0.524263 Galileo Galilei Observatory, Oro Verde
+X33 299.99039 0.998647 -0.051941 OARU, Manaus
 X38 301.13711 0.825648 -0.562299 Observatorio Pueyrredon, La Lonja
 X39 301.1378  0.82615  -0.56158  Observatorio Antares, Pilar
+X40 301.61689 0.822572 -0.566762 Cielos de Banfield, Banfield
 X50 303.82419 0.821025 -0.568999 Observatorio Astronomico de Montevideo
 X57 305.40626 0.903659 -0.426885 Polo Astron&#244;mico CMF,Foz do Igua&#231;u
 X70 308.43322 0.931623 -0.362375 Observatorio OATU, Tupi Paulista
 X74 309.1506  0.92987  -0.36684  Observat&#243;rio Campo dos Amarais
 X87 312.0889  0.96218  -0.27210  <a href="http://dogsheaven.tachyonweb.net/">Dogsheaven Observatory, Brasilia</a>
 X88 312.49131 0.918012 -0.395458 Observatorio Adhara, Sorocaba
-X89 312.21786 0.962245 -0.271267 Rocca Observatory, Brasilia
+X89 312.21786 0.962401 -0.271311 Rocca Observatory, Brasilia
 X90 312.13208 0.963322 -0.268189 Carina Observatory, Brasilia
+X93 313.6047  0.92363  -0.38244  Munhoz Observatory
 Y00 315.21504 0.935906 -0.351562 <a href="http://www.observatorio-phoenix.org/t_proj/Sonear/sonear.htm">SONEAR Observatory, Oliveira</a>
 Y16 318.68794 0.929268 -0.368170 ROCG, Campos dos Goytacazes
 Y28 321.3126  0.98840  -0.15179  OASI, Nova Itacuruba
 Y40 324.03889 0.989706 -0.143217 Discovery Observatory, Caruaru
+Y90 354.5553  0.73015  +0.68115  Observatorio ESTELIA, Ladines
+Y91 354.83350 0.802497 +0.594854 Ras Algethi, Ronda
+Z00 353.26586 0.798528 +0.599968 BOOTES-1, Mazagon
+Z01 352.13321 0.856462 +0.515344 OWL-Net, Ouka&#239;meden
+Z02 352.13331 0.856450 +0.515339 HAO observatory, Ouka&#239;meden
+Z03 355.73346 0.761330 +0.646426 Rio Cofio, Robledo de Chavela
+Z04 352.98203 0.833809 +0.550302 MAO, Ain Laqsab
+Z05 355.36389 0.802644 +0.594495 Observatorio Horus, Cartama
 Z06 357.67324 0.787439 +0.614746 Marina Sky, Nerpio
 Z07 356.36050 0.798537 +0.600132 Ad Astra Sangos Observatory, Alhendin
-Z08 357.59139 0.794477 +0.605566 Telescope Live, Oria
+Z08 357.59139 0.794477 +0.605566 <a href="https://telescope.live/">Telescope Live, Oria</a>
 Z09 356.8786  0.62844  +0.77527  Old Orchard Observatory, Fiddington
 Z10 353.37235 0.786766 +0.615329 PGC, Fregenal de la Sierra
 Z11 358.96669 0.601635 +0.796115 Appledorne Observatory, Farnsfield
@@ -2409,11 +2562,14 @@ <h2>List Of Observatory Codes</h2>
 Z21 343.48830 0.881468 +0.471452 Tenerife-LCO Aqawan A {#}1
 Z22 343.4894  0.88148  +0.47143  MASTER-IAC Observatory, Tenerife
 Z23 342.11492 0.877679 +0.478433 Nordic Optical Telescope, La Palma
+Z24 343.48848 0.881475 +0.471460 Tenerife Observatory-LCO B, Tenerife
 Z25 343.49031 0.881476 +0.471450 Artemis Observatory, Teide
 Z26 343.38969 0.883010 +0.467899 Observatorio Astronomico Arcangel, Las Zocas
 Z27 343.6998  0.87976  +0.47393  Observatorio Coralito, La Laguna
+Z28 357.67331 0.787438 +0.614748 Northern Skygems Observatory, Nerpio
 Z29 354.11944 0.751634 +0.657576 Observatorio Astronomico Sobradillo
 Z30 355.52500 0.586571 +0.807215 Glyn Marsh Observatory, Douglas
+Z31 343.48835 0.881476 +0.471458 Tenerife Observatory-LCO A, Tenerife
 Z32 358.98372 0.766879 +0.640130 Observatorio Astrofisico de Javalambre
 Z33 357.67331 0.787438 +0.614748 6ROADS Observatory 2, Nerpio
 Z34 359.11233 0.612800 +0.787622 NNHS Drummonds Observatory
@@ -2425,7 +2581,7 @@ <h2>List Of Observatory Codes</h2>
 Z40 355.5127  0.80240  +0.59482  El Manzanillo Observatory, Puerto de la Torre
 Z41 356.6264  0.76087  +0.64689  Irydeo Observatory, Camarma de Esteruelas
 Z42 357.66579 0.631495 +0.772801 Rushay Farm Observatory, Sturminster Newton
-Z43 357.4622  0.66474  +0.74460  Landehen
+Z43 357.46216 0.664742 +0.744597 Landehen
 Z44 351.67248 0.728723 +0.682549 Observatorio Terminus, A Coru&#241;a
 Z45 355.14264 0.804657 +0.591779 Cosmos Observatory, Marbella
 Z46 356.80700 0.623612 +0.779131 Cardiff
@@ -2440,7 +2596,7 @@ <h2>List Of Observatory Codes</h2>
 Z55 354.9150  0.79391  +0.60604  Uraniborg Observatory, \'{E}cija
 Z56 350.2119  0.61577  +0.78529  Knocknaboola
 Z57 355.42589 0.803207 +0.593753 Observatorio Zuben, Alhaur&#237;n de la Torre
-Z58 355.63068 0.762093 +0.645483 ESA Cebreros TBT Observatory, Cebreros
+Z58 355.63068 0.762093 +0.645483 ESA TBT Cebreros Observatory
 Z59 357.71540 0.599292 +0.797871 Chelford Observatory
 Z60 357.8506  0.73205  +0.67900  Observatorio Zaldibia
 Z61 359.06400 0.748594 +0.660857 Montecanal Observatory, Zaragoza
@@ -2495,24 +2651,24 @@ <h2>List Of Observatory Codes</h2>
         <ul>
           <li><a href="/">Home</a></li>
           <li><a href="/about">About</a></li>
-	  <!-- Contact link changed to Jira -->
+     <!-- Contact link changed to Jira -->
           <li><a href="https://mpc-service.atlassian.net/servicedesk/customer/portals">Contact</a></li>
           <li><a href="https://www.cfa.harvard.edu/content/privacy-statement">Privacy</a></li>
         </ul>
       </nav>
-      
+
       <a href="https://www.cfa.harvard.edu">
       <img src="/images/CfA_Logo_Vertical_CMYK.png" width="110" height="47"></a>
       <p>
       <p>
       <p>
-      <div class="copy">The Minor Planet Center is hosted by the Center for Astrophysics | Harvard &amp; Smithsonian.<center>The Minor Planet Center is funded by NASA.</center></div> 
+      <div class="copy">The Minor Planet Center is hosted by the Center for Astrophysics | Harvard &amp; Smithsonian.<center>The Minor Planet Center is funded by NASA.</center></div>
   </footer>
 
 <script type="text/javascript">
   $(window).on('load', (function() {
     $("table").tablesorter();
-  })); 
+  }));
 </script>
 
 <script type="text/javascript">
diff --git a/ades_out.cpp b/ades_out.cpp
index 6bc2678b..abc10146 100644
--- a/ades_out.cpp
+++ b/ades_out.cpp
@@ -29,6 +29,7 @@ have to wait for another day.       */
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <stringex.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <math.h>
@@ -39,77 +40,189 @@ have to wait for another day.       */
 #include "details.h"
 #include "afuncs.h"
 
-/* Enables some graceless hacks needed by me (Bill Gray) to deal with
-~2000 sungrazing comets.  The files lack contact data (should be me) and
-mag band data (should be V).  And some sungrazers have data from up to
-three places, but only one header.
-
- If the following is defined,  the contact name and mag band will be in
-the ADES output,  even if absent in the input data.  And if one or more
-places lack headers,  we fill in from the first available header (the
-sungrazer spacecraft all have identical headers,  fortunately.)  */
-
-/* #define FOR_SUNGRAZER_PROJECT       1     */
-
 char *get_file_name( char *filename, const char *template_file_name);
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
+char *fgets_trimmed( char *buff, size_t max_bytes, FILE *ifile); /*elem_out.c*/
+double utc_from_td( const double jdt, double *delta_t);     /* ephem0.cpp */
 char *iso_time( char *buff, const double jd, const int precision);   /* elem_out.c */
-int get_satellite_offset( const char *iline, double *xyz);  /* mpc_obs.cpp */
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
+double original_observed_ra( const OBSERVE *obs);     /* ephem0.cpp */
+double original_observed_dec( const OBSERVE *obs);    /* ephem0.cpp */
 
 #define PI 3.1415926535897932384626433832795028841971693993751058209749445923
 
-static const char **fallback_obs_details = NULL;
+static const char *_skip_number( const char *tptr)
+{
+   while( isdigit( *tptr))
+      tptr++;
+   if( *tptr == '.')
+      {
+      tptr++;
+      while( isdigit( *tptr))
+         tptr++;
+      }
+   return( tptr);
+}
+
+/* Column 14 ('note 1') of punched-card astrometry contains either an
+alphabetical note (see https://minorplanetcenter.net/iau/info/ObsNote.html
+for their meanings) or a program code :
+
+https://minorplanetcenter.net//iau/lists/ProgramCodes.txt
+https://minorplanetcenter.net/static/downloadable-files/program_codes.json
+
+We do have the problem that many program codes are now letters.  If column
+14 contains a letter,  and that letter is in use as a program code,  we
+can't tell if the letter means "program code" or "note".  For my current
+problem -- sungrazing astrometry -- column 14 will always indicate the
+instrument used (see bottom of 'ObsNotes.html'), but that will not work
+reliably with other obscodes.  */
+
+static char program_code( const OBSERVE *obs)
+{
+   if( strchr( "ABGHOP", obs->note1) && strstr( "249 C49 C50", obs->mpc_code))
+      return( obs->note1);    /* SOHO and STEREO program codes */
+   return( isalpha( obs->note1) ? ' ' : obs->note1);
+}
+
+/* Given a line such as 'OBS E. E. Barnard, M. Wolf',  this will write out
+
+        <name>E. E. Barnard</name>
+        <name>M. Wolf</name>
+
+   i.e.,  it 'ADES-izes' old-style observer details. */
+
+static int dump_one_line_of_names( FILE *ofile, const char *line)
+{
+   int n_found = 0;
+
+   if( !memcmp( line, "TEL ", 4))         /* telescope lines are 'special' */
+      {
+      const char *tptr = _skip_number( line + 4);
+
+      if( tptr != line + 4 && *tptr == '-' && tptr[1] == 'm' && tptr[2] == ' ')
+         {
+         char aperture[9], f_ratio[9];
+         const size_t aperture_len = tptr - (line + 4);
+
+         assert( aperture_len < 7);
+         strlcpy( aperture, line + 4, aperture_len + 1);
+         tptr += 3;
+         *f_ratio = '\0';
+         if( tptr[0] == 'f' && tptr[1] == '/')
+            {
+            if( tptr[2] == '?')
+               tptr += 4;
+            else
+               {
+               const char *f_ratio_ptr = tptr + 2;
+               tptr = _skip_number( f_ratio_ptr);
+               assert( tptr > f_ratio_ptr);
+               assert( tptr - f_ratio_ptr < 7);
+               strlcpy( f_ratio, f_ratio_ptr, tptr - f_ratio_ptr + 1);
+               tptr++;
+               }
+            }
+         if( ofile)
+            {
+            int len = 0;
+            const char *detector = "UNK";   /* default assumption */
+
+            while( tptr[len] && tptr[len + 1] != '+')
+               len++;
+            fprintf( ofile, "        <aperture>%s</aperture>\n", aperture);
+            if( *f_ratio)
+               fprintf( ofile, "        <fRatio>%s</fRatio>\n", f_ratio);
+            if( tptr[len] && tptr[len + 1] == '+')
+               {
+               if( strstr( tptr + len, "CCD"))
+                  detector = "CCD";
+               else if( strstr( tptr + len, "CMO"))
+                  detector = "CMO";
+               }
+            fprintf( ofile, "        <detector>%s</detector>\n", detector);
+            if( !memcmp( tptr, "coronagraph", 11))
+               {
+               fprintf( ofile, "        <name>%s</name>\n", tptr + 12);
+               len = 11;
+               }
+            fprintf( ofile, "        <design>%.*s</design>\n", len, tptr);
+            }
+         n_found = 1;
+         }
+      return( n_found);
+      }
+
+   while( *line > ' ')
+      line++;
+   while( *line >= ' ')
+      {
+      size_t len = 0;
+
+      while( *line == ' ')
+         line++;
+      while( line[len] != ',' && line[len] >= ' ')
+         len++;
+      if( len > 3 && line[1] == '.' && line[2] == ' ')
+         {           /* very incomplete verification that it's really a name */
+         if( ofile)
+            fprintf( ofile, "        <name>%.*s</name>\n", (int)len, line);
+         n_found++;
+         }
+      line += len;
+      if( *line == ',')
+         line++;
+      }
+   return( n_found);
+}
 
-static void output_names( FILE *ofile, const OBSERVE FAR *obs, const char *target)
+static int output_names( FILE *ofile, const OBSERVE FAR *obs, const char *target)
 {
    int i, n_found = 0;
    const size_t tlen = strlen( target);
-   const char *tptr, *tptr2;
+   const char *tptr;
    const char **obs_details = obs->obs_details;
+   const bool only_one_line = (!strcmp( target, "TEL ") || !ofile);
 
-   if( !obs_details)
-      obs_details = fallback_obs_details;
    if( obs_details)
       for( i = 0; (tptr = obs_details[i]) != NULL; i++)
          if( !strncmp( tptr, target, tlen))
             {
-            tptr += tlen;
-            while( tptr && *tptr)
-               {
-               size_t name_len;
-
-               if( *tptr == ',')
-                  tptr++;
-               while( *tptr == ' ')
-                  tptr++;
-               tptr2 = strchr( tptr, ',');
-               name_len = (tptr2 ? tptr2 - tptr : strlen( tptr));
-               if( name_len)
-                  {
-                  fprintf( ofile, "        <name>%.*s</name>\n", (int)name_len, tptr);
-                  n_found++;
-                  }
-               tptr = tptr2;
-               }
+            n_found += dump_one_line_of_names( ofile, tptr);
+            if( only_one_line)
+               break;
             }
-#ifdef FOR_SUNGRAZER_PROJECT
+
    if( !n_found)
-      fprintf( ofile, "        <name>W. Gray</name>\n");
-#endif
-}
+      {
+      FILE *ifile = fopen_ext( "details.txt", "fcrb");
+      char buff[200];
+      int got_it = 0;
 
-/* Column 14 ('note 1') of punched-card astrometry contains either an
-alphabetical note (see https://minorplanetcenter.net/iau/info/ObsNote.html
-for their meanings) or a program code (was on the MPC site,  not
-currently available).         */
+      while( !got_it && fgets( buff, sizeof( buff), ifile))
+         got_it = (!memcmp( buff, "COD ", 4) && !memcmp( buff + 4, obs->mpc_code, 3)
+                  && (buff[7] != ' ' || buff[8] == program_code( obs)));
+      if( got_it)
+         while( fgets_trimmed( buff, sizeof( buff), ifile) && memcmp( buff, "COD ", 4))
+            if( !strncmp( buff, target, tlen))
+               {
+               n_found += dump_one_line_of_names( ofile, buff);
+               if( only_one_line)
+                  break;
+               }
 
-static char program_code( const OBSERVE *obs)
-{
-   if( strchr( "ABGHOP", obs->note1) && strstr( "249 C49 C50", obs->mpc_code))
-      return( obs->note1);    /* SOHO and STEREO program codes */
-   return( isalpha( obs->note1) ? ' ' : obs->note1);
+      if( !n_found)     /* look for 'default' details */
+         {
+         while( fgets( buff, sizeof( buff), ifile))
+            if( !memcmp( buff, "COD Def", 7))
+               {
+               while( fgets_trimmed( buff, sizeof( buff), ifile))
+                  if( !strncmp( buff, target, tlen))
+                     n_found += dump_one_line_of_names( ofile, buff);
+               }
+         }
+      fclose( ifile);
+      }
+   return( n_found);
 }
 
 /* Outputs _only_ those observations from the station and program code
@@ -121,27 +234,39 @@ static void create_ades_file_for_one_code( FILE *ofile,
    char buff[200];
    const char *code = obs->mpc_code;
    const char progcode = program_code( obs);
+   const bool is_sungrazer = (strstr( "249 C49 C50 PSP", code) != NULL);
 
    fprintf( ofile, "  <obsBlock>\n");
    fprintf( ofile, "    <obsContext>\n");
    fprintf( ofile, "      <observatory>\n");
    fprintf( ofile, "        <mpcCode>%s</mpcCode>\n", obs->mpc_code);
    fprintf( ofile, "      </observatory>\n");
-   fprintf( ofile, "      <submitter>\n");
-   output_names( ofile, obs, "CON ");
-   fprintf( ofile, "      </submitter>\n");
-   fprintf( ofile, "      <observers>\n");
-   output_names( ofile, obs, "OBS ");
-   fprintf( ofile, "      </observers>\n");
-   fprintf( ofile, "      <measurers>\n");
-   output_names( ofile, obs, "MEA ");
-   fprintf( ofile, "      </measurers>\n");
-   fprintf( ofile, "      <telescope>\n");
-   fprintf( ofile, "        <design>Coronagraph</design>\n");
-   fprintf( ofile, "        <aperture>0.11</aperture>\n");
-   fprintf( ofile, "        <detector>CCD</detector>\n");
-   fprintf( ofile, "        <name>C2</name>\n");
-   fprintf( ofile, "      </telescope>\n");
+   if( output_names( NULL, obs, "CON ") || is_sungrazer)
+      {
+      fprintf( ofile, "      <submitter>\n");
+               /* Workaround for sungrazers without contact info */
+      if( !output_names( ofile, obs, "CON ") && is_sungrazer)
+         fprintf( ofile, "        <name>W. Gray</name>\n");
+      fprintf( ofile, "      </submitter>\n");
+      }
+   if( output_names( NULL, obs, "OBS "))
+      {
+      fprintf( ofile, "      <observers>\n");
+      output_names( ofile, obs, "OBS ");
+      fprintf( ofile, "      </observers>\n");
+      }
+   if( output_names( NULL, obs, "MEA "))
+      {
+      fprintf( ofile, "      <measurers>\n");
+      output_names( ofile, obs, "MEA ");
+      fprintf( ofile, "      </measurers>\n");
+      }
+   if( output_names( NULL, obs, "TEL "))
+      {
+      fprintf( ofile, "      <telescope>\n");
+      output_names( ofile, obs, "TEL ");
+      fprintf( ofile, "      </telescope>\n");
+      }
    fprintf( ofile, "    </obsContext>\n");
    fprintf( ofile, "    <obsData>\n");
    while( n_obs--)
@@ -172,16 +297,45 @@ static void create_ades_file_for_one_code( FILE *ofile,
             fprintf( ofile, "        <ctr>399</ctr>\n");
             for( i = 0; i < 3; i++)
                fprintf( ofile, "        <pos%d>%.*f</pos%d>\n",
-                        i + 1, (is_au ? 13 : 4), posn[i] * (is_au ? 1. : AU_IN_KM), i + 1);
+                        i + 1, (is_au ? 9 : 4), posn[i] * (is_au ? 1. : AU_IN_KM), i + 1);
+            if( !(obs->flags & OBS_NO_VELOCITY))
+               {
+               double vel[3];
+
+               compute_observer_vel( obs->jd, 3, 0., 0., 0., vel);
+               for( i = 0; i < 3; i++)
+                  vel[i] = obs->obs_vel[i] - vel[i]; /* make a geocentric velocity vector */
+               ecliptic_to_equatorial( vel);
+               for( i = 0; i < 3; i++)
+                  fprintf( ofile, "        <vel%d>%.8f</vel%d>\n", i + 1,
+                        vel[i] * (is_au ? 1. : AU_IN_KM / seconds_per_day), i + 1);
+               }
+            }
+         else if( obs->note2 == 'V')
+            {
+            int i;
+
+            fprintf( ofile, "        <sys>WGS84</sys>\n");
+            fprintf( ofile, "        <ctr>399</ctr>\n");
+            for( i = 0; i < 3; i++)
+               {
+               memcpy( buff, obs->second_line + i * 11 + 34, 10);
+               buff[i == 2 ? 5 : 10] = '\0';
+               text_search_and_replace( buff, " ", "");
+               fprintf( ofile, "        <pos%d>%s</pos%d>\n",
+                        i + 1, buff, i + 1);
+               }
             }
 //       if( progcode != ' ')
 //          fprintf( ofile, "        <prog>%c</prog>\n", progcode);
          fprintf( ofile, "        <obsTime>%s</obsTime>\n",
-                  iso_time( buff, obs->jd, 3));         /* elem_out.cpp */
-         fprintf( ofile, "        <ra>%.11f</ra>\n", obs->ra * 180. / PI);
-         fprintf( ofile, "        <dec>%.11f</dec>\n", obs->dec * 180. / PI);
-         fprintf( ofile, "        <rmsRA>%.4f</rmsRA>\n", obs->posn_sigma_1);
-         fprintf( ofile, "        <rmsDec>%.4f</rmsDec>\n", obs->posn_sigma_2);
+                  iso_time( buff, utc_from_td( obs->jd, NULL), 3));
+         fprintf( ofile, "        <ra>%.9f</ra>\n",
+                                    original_observed_ra( obs) * 180. / PI);
+         fprintf( ofile, "        <dec>%.9f</dec>\n",
+                                    original_observed_dec( obs) * 180. / PI);
+         fprintf( ofile, "        <rmsRA>%.3f</rmsRA>\n", obs->posn_sigma_1);
+         fprintf( ofile, "        <rmsDec>%.3f</rmsDec>\n", obs->posn_sigma_2);
          fprintf( ofile, "        <rmsCorr>%.4f</rmsCorr>\n", correlation);
          if( !catalogue)
             catalogue = "UNK";
@@ -195,12 +349,12 @@ static void create_ades_file_for_one_code( FILE *ofile,
 
             fprintf( ofile, "        <mag>%.*f</mag>\n",
                                     obs->mag_precision, obs->obs_mag);
-#ifdef FOR_SUNGRAZER_PROJECT
-            if( mag_band == ' ')
+            if( is_sungrazer && mag_band == ' ')
                mag_band = 'V';
-#endif
             fprintf( ofile, "        <band>%c</band>\n", mag_band);
             }
+         if( is_sungrazer)   /* for these,  the 'note' is always a 'program code' */
+            fprintf( ofile, "        <notes>%c</notes>\n", progcode);
          fprintf( ofile, "      </optical>\n");
          }
       obs++;
@@ -227,12 +381,7 @@ void create_ades_file( const char *filename, const OBSERVE FAR *obs,
    *codes = '\0';
    setbuf( ofile, NULL);
    fprintf( ofile, "<?xml version=\"1.0\" ?>\n");
-   fprintf( ofile, "<ades version=\"2017\">\n");
-#ifdef FOR_SUNGRAZER_PROJECT
-   for( i = 0; i < n_obs; i++)
-      if( obs[i].obs_details)
-         fallback_obs_details = obs[i].obs_details;
-#endif
+   fprintf( ofile, "<ades version=\"2022\">\n");
    for( i = 0; i < n_obs; i++)
       {
       char new_search[5];
diff --git a/assert2.h b/assert2.h
new file mode 100644
index 00000000..2ecc5b81
--- /dev/null
+++ b/assert2.h
@@ -0,0 +1,27 @@
+/* #including this file,  instead of the 'usual' <assert.h>,  will
+cause assert()s to always be evaluated,  even in non-debug mode.
+This is useful if
+
+   -- you really do always want to evaluate the assertions;  or
+   -- you have variables that are only used in the assert()s,  and
+which result in "unused variable" warnings in NDEBUG mode.  (Or,  with
+the usual -Werror flag,  errors.)
+
+   Such warnings/errors can be ugly to code around.  If the assert() in
+question is inexpensive (not evaluated inside a performance-intensive
+loop),  it may be easier to force the assert() to be evaluated,  causing
+the warning or error to go away.
+
+   The ideal thing would be to have an assert_even_in_debug() function or
+macro.  This would be useful if,  for example,  the assert() is evaluated
+frequently enough to be a performance issue.  At present,  I don't have that
+problem;  if I eventually do,  I may re-visit this bit of code.      */
+
+#ifdef NDEBUG          /* assert() would not normally be compiled */
+   #define TEMP_NDEBUG NDEBUG
+   #undef NDEBUG
+   #include <assert.h>
+   #define NDEBUG TEMP_NDEBUG
+#else
+   #include <assert.h>
+#endif
diff --git a/b32_eph.cpp b/b32_eph.cpp
deleted file mode 100644
index 44fb0504..00000000
--- a/b32_eph.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/* b32_eph.cpp: computes binary ephemerides,  mostly for use
-with Guide
-
-Copyright (C) 2010, Project Pluto
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.    */
-
-#include <stdio.h>
-#include <math.h>
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
-#include "watdefs.h"
-#include "lunar.h"
-#include "afuncs.h"
-#include "date.h"
-#include "comets.h"
-
-const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
-int generic_message_box( const char *message, const char *box_type);
-int earth_lunar_posn( const double jd, double FAR *earth_loc, double FAR *lunar_loc);
-int planet_posn( const int planet_no, const double jd, double *vect_2000);
-int integrate_orbit( double *orbit, double t0, double t1);
-int add_ephemeris_details( FILE *ofile, const double start_jd,  /* b32_eph.c */
-                                               const double end_jd);
-int create_b32_ephemeris( const char *filename, const double epoch,
-                const double *orbit, const int n_steps,         /* b32_eph.c */
-                const double ephem_step, const double jd_start);
-char *get_file_name( char *filename, const char *template_file_name);
-FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
-
-int add_ephemeris_details( FILE *ofile, const double start_jd,
-                                               const double end_jd)
-{
-   time_t t0;
-   char tbuff[128];
-   FILE *ifile;
-   extern const char *elements_filename;
-   const char *vector_options = get_environment_ptr( "VECTOR_OPTS");
-
-   t0 = time( NULL);
-   fprintf( ofile, "\nCreated %s", ctime( &t0));
-
-   full_ctime( tbuff, start_jd, CALENDAR_JULIAN_GREGORIAN);
-   fprintf( ofile, "Ephemeris start: %s\n", tbuff);
-
-   full_ctime( tbuff, end_jd, CALENDAR_JULIAN_GREGORIAN);
-   fprintf( ofile, "Ephemeris end:   %s\n", tbuff);
-
-   fprintf( ofile, "Times are all TDT\n");
-   fprintf( ofile, "Positions/velocities are in %s J2000\n",
-                      atoi( vector_options) ? "ecliptic" : "equatorial");
-
-   ifile = fopen_ext( get_file_name( tbuff, elements_filename), "tfcrb");
-   while( fgets( tbuff, sizeof( tbuff), ifile))
-      fwrite( tbuff, strlen( tbuff), 1, ofile);
-   fclose( ifile);
-   return( 0);
-}
-
-/* See 'interpol.cpp' for details on this.  Implementation is "clever",  and
-therefore requires a fair bit of explanation. */
-
-static double interpolate( const double *y, const double x, const int n_pts)
-{
-   double t = 1., c = 1., rval;
-   int i;
-
-   for( i = 0; i < n_pts; i++)
-      {
-      c *= x - (double)i;
-      if( i)
-         t *= -(double)i;
-      }
-   if( !c)        /* we're on an abscissa */
-      rval = y[(int)( x + .5)];
-   else
-      {
-      rval = y[0] / (t * x);
-      for( i = 1; i < n_pts; i++)
-         {
-         t *= (double)i / (double)( i - n_pts);
-         rval += y[i] / (t * (x - (double)i));
-         }
-      rval *= c;
-      }
-   return( rval);
-}
-
-#define MAX_N_PTS 20
-
-static int best_interpolation_order( const double *ovals,
-                  const int array_size, double *max_err)
-{
-   int i, axis, j, n_pts, rval = 0;
-
-   *max_err = 1e+20;
-   for( n_pts = 4; n_pts < MAX_N_PTS; n_pts += 2)
-      {
-      double worst = 0.;
-
-      for( i = 0; (i + n_pts) * 2 < array_size; i++)
-         for( axis = 0; axis < 3; axis++)
-            {
-            double tarray[MAX_N_PTS];
-            double err;
-
-            for( j = 0; j < n_pts; j++)
-               tarray[j] = ovals[(i + j) * 6 + axis];
-
-            if( n_pts & 1)    /* for odd number of points... */
-               err = interpolate( tarray, (double)n_pts / 2., n_pts);
-            else              /* for even number of points... */
-               err = interpolate( tarray, (double)(n_pts - 1.) / 2., n_pts);
-            err -= ovals[i * 6 + ((n_pts - 1) / 2) * 6 + 3 + axis];
-            err = fabs( err);
-            if( worst < err)
-               worst = err;
-            }
-      if( worst < *max_err)
-         {
-         *max_err = worst;
-         rval = n_pts;
-         }
-      }
-   return( rval);
-}
-
-/* In the following,  we compute twice as many data points as we eventually
-use,  going at half steps.  That lets us check the "intermediate" (odd)
-points against the even ones,  to see how much error is involved;  the
-order with the lowest error is then output.  We also can see which ordinate
-has the highest absolute value,  and scale the long integers to fit. */
-
-int create_b32_ephemeris( const char *filename, const double epoch,
-                const double *orbit, const int n_steps,
-                const double ephem_step, const double jd_start)
-{
-   double orbi[6], curr_jd, max_ordinate = 0., resolution;
-   double *output_array = (double *)calloc( n_steps * 2,
-                                 3 * sizeof( double));
-   double prev_ephem_t = epoch, max_err;
-   int i, j, jpl_id = 0, planet_center = 0;
-   FILE *ofile;
-   char tbuff[128];
-   static const char *hdr_fmt = "%d %03d %10.1f %.2f %ld %d %g %d %d ";
-
-                     /* hunt for the JPL ID: */
-   for( i = 0; filename[i] && !jpl_id; i++)
-      {
-      jpl_id = atoi( filename + i);
-      planet_center = (int)( filename[i] - '0');
-      }
-   memcpy( orbi, orbit, 6 * sizeof( double));
-   curr_jd = jd_start;
-   for( i = 0; i < n_steps * 2; i++)
-      {
-      double obs_posn[3];
-      double *topo = output_array + i * 3;
-
-//    ephemeris_t = curr_jd + td_minus_ut( curr_jd) / seconds_per_day;
-      integrate_orbit( orbi, prev_ephem_t, curr_jd);
-      prev_ephem_t = curr_jd;
-      if( planet_center == 3)
-         earth_lunar_posn( curr_jd, obs_posn, NULL);
-      else
-         planet_posn( planet_center, curr_jd, obs_posn);
-      for( j = 0; j < 3; j++)
-         topo[j] = orbi[j] - obs_posn[j];
-
-      ecliptic_to_equatorial( topo);                           /* mpc_obs.cpp */
-      for( j = 0; j < 3; j++)
-         if( max_ordinate < fabs( topo[j]))
-            max_ordinate = fabs( topo[j]);
-      curr_jd += ephem_step / 2.;
-      }
-
-   resolution = max_ordinate / 2.e+9;
-   ofile = fopen( filename, "wb");
-   memset( tbuff, 0, 128);
-   sprintf( tbuff, hdr_fmt, 128, jpl_id,
-            jd_start, ephem_step, n_steps,
-            best_interpolation_order( output_array, 2 * n_steps, &max_err),
-            resolution, 32, 0);
-
-   fwrite( tbuff, 128, 1, ofile);
-   for( i = 0; i < n_steps; i++)
-      for( j = 0; j < 3; j++)
-         {
-         const int32_t tval = (int32_t)( output_array[i * 6 + j] / resolution);
-         fwrite( &tval, 1, sizeof( int32_t), ofile);
-         }
-   free( output_array);
-   add_ephemeris_details( ofile, jd_start, curr_jd);
-   fclose( ofile);
-   sprintf( tbuff, "max err: %.3g\nEnd: ", max_err);
-   full_ctime( tbuff + strlen( tbuff), curr_jd, CALENDAR_JULIAN_GREGORIAN);
-   generic_message_box( tbuff, "o");
-   return( 0);
-}
diff --git a/bc405.cpp b/bc405.cpp
index 182521dc..da19b65b 100644
--- a/bc405.cpp
+++ b/bc405.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "watdefs.h"
 #include "comets.h"
 #include "afuncs.h"
+#include "constant.h"
 
 /* BC-405 gives orbital elements for 300 large asteroids at 40-day intervals,
 running from JD 2378495.0 = 1799 Dec 30.5 to JD 2524615.0 = 2200 Jan 22.5.
@@ -50,7 +51,7 @@ int detect_perturbers( const double jd, const double * __restrict xyz,
 double *get_asteroid_mass( const int astnum);   /* bc405.cpp */
 int generic_message_box( const char *message, const char *box_type);
 int asteroid_position_raw( const int astnum, const double jd,
-                              double *posn);       /* bc405.cpp */
+                              double *posn, double *vel);      /* bc405.cpp */
 int planet_posn( const int planet_no, const double jd, double *vect_2000);
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
 const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
@@ -65,12 +66,19 @@ static int bc405_n_asteroids = MAX_BC405_N_ASTEROIDS;
 static double bc405_start_jd = 2378495.;
 static double bc405_chunk_time = 40.;
 
-static FILE *open_bc405_file( void)
+static FILE *open_bc405_file( const bool shutting_down)
 {
    const char *data_file_name = "bc405.dat";
    static FILE *ifile;
    static int failure_detected = 0;
 
+   if( shutting_down)
+      {
+      if( ifile)
+         fclose( ifile);
+      ifile = NULL;
+      return( NULL);
+      }
    if( failure_detected)
       return( NULL);
    if( !ifile)
@@ -133,9 +141,6 @@ static FILE *open_bc405_file( void)
    return( ifile);
 }
 
-#define GAUSS_K .01720209895
-#define SOLAR_GM (GAUSS_K * GAUSS_K)
-
 static void grab_elems( ELEMENTS *elems, FILE *fp, const int chunk_number)
 {
    double array[6];
@@ -165,10 +170,9 @@ static void grab_cached_elems( ELEMENTS *elems, const int chunk_number,
 {
    static int astnums[N_CACHED_ELEMS], chunk_num[N_CACHED_ELEMS];
    static ELEMENTS *cache = NULL;
-   FILE *fp = open_bc405_file( );
+   FILE *fp;
    int i;
 
-   assert( fp);
    if( !elems)
       {
       if( cache)
@@ -178,6 +182,8 @@ static void grab_cached_elems( ELEMENTS *elems, const int chunk_number,
          astnums[i] = chunk_num[i] = -1;
       return;
       }
+   fp = open_bc405_file( false);
+   assert( fp);
    if( !cache)
       cache = (ELEMENTS *)calloc( N_CACHED_ELEMS, sizeof( ELEMENTS));
    assert( cache);
@@ -287,7 +293,7 @@ static int find_and_set_precomputed_data( FILE *precomputed_fp,
                          const int bc_chunk, int16_t *__restrict posns)
 {
    const int chunk_size = bc405_n_asteroids * 3;
-   FILE *bc405_elem_file = open_bc405_file( );
+   FILE *bc405_elem_file = open_bc405_file( false);
    int i;
 
    assert( bc405_elem_file);
@@ -346,6 +352,7 @@ static double *load_asteroid_masses( void)
             if( rval)
                rval[i++] = mass;
             }
+      fclose( ifile);
 /*    rval[0] = 4.747105847157599504245142421641e-10;  (solar masses) */
       }  /* Ceres: special 63 km^3/s^2 value:  not now in use */
          /* since found to be 62.68 km^3/s^2 by Dawn = 4.7229935634e-10 */
@@ -354,19 +361,19 @@ static double *load_asteroid_masses( void)
 }
 
 int asteroid_position_raw( const int astnum, const double jd,
-                              double *posn)
+                              double *posn, double *vel)
 {
    ELEMENTS elem;
    int chunk;
 
-   open_bc405_file( );
+   open_bc405_file( false);
    chunk = (int)( (jd - bc405_start_jd) / bc405_chunk_time + .5);
    if( chunk < 0)
       chunk = 0;
    else if( chunk >= n_bc405_chunks - 1)
       chunk = n_bc405_chunks - 1;
    grab_cached_elems( &elem, chunk, astnum);
-   comet_posn( &elem, jd, posn);
+   comet_posn_and_vel( &elem, jd, posn, vel);
    return( 0);
 }
 
@@ -393,14 +400,14 @@ int detect_perturbers( const double jd, const double * __restrict xyz,
    static FILE *precomputed_fp;
    static bool bc405_available = true;
    static int n_asteroids_to_use = 0;
-   double thresh = atof( get_environment_ptr( "ASTEROID_THRESH"));
+   double thresh;
    int i, load_posn0 = 0, load_posn1 = 0, chunk, n_fixed = 0;
-   const char *fixed_perturber_list = get_environment_ptr( "ASTEROID_PERT_LIST");
+   const char *fixed_perturber_list;
    int fixed_perturbers[MAX_BC405_N_ASTEROIDS];
 
    if( !bc405_available)
       return( NO_BC405_FILE);
-   if( !xyz)
+   if( !xyz)              /* freeing memory, closing cached file pointers */
       {
       if( precomputed_fp)
          fclose( precomputed_fp);
@@ -408,7 +415,12 @@ int detect_perturbers( const double jd, const double * __restrict xyz,
          free( masses);
       precomputed_fp = NULL;
       masses = NULL;
+      open_bc405_file( true);
+      grab_cached_elems( NULL, 0, 0);
+      return( 0);
       }
+   thresh = atof( get_environment_ptr( "ASTEROID_THRESH"));
+   fixed_perturber_list = get_environment_ptr( "ASTEROID_PERT_LIST");
    if( !masses)
       masses = load_asteroid_masses( );
    if( !masses)
@@ -416,7 +428,7 @@ int detect_perturbers( const double jd, const double * __restrict xyz,
       bc405_available = false;
       return( NO_BC405_FILE);
       }
-   if( !open_bc405_file( ))
+   if( !open_bc405_file( false))
       {
       bc405_available = false;
       return( NO_BC405_FILE);
@@ -531,10 +543,9 @@ int detect_perturbers( const double jd, const double * __restrict xyz,
                if( dist2 < .05 * 0.05)
                   {
                   FILE *debug_file = fopen( "astpert.txt", "ab");
-                  const double j2000 = 2451545.;
 
                   fprintf( debug_file, "%.5f: %3d, %f: mass %g\n",
-                           (jd - j2000) / 365.25 + 2000.,
+                           JD_TO_YEAR( jd),
                            asteroid_numbers[i], sqrt( dist2) * AU_IN_KM, masses[i]);
                   fclose( debug_file);
                   }
@@ -583,7 +594,7 @@ int main( const int argc, char **argv)
    const int asteroid_number = atoi( argv[1]);
    const double jd = atof( argv[2]);
    const int chunk_number = (int)( (jd - bc405_start_jd) / bc405_chunk_time + .5);
-   FILE *fp = open_bc405_file( );
+   FILE *fp = open_bc405_file( false);
    ELEMENTS elems;
    double posn[4];
    int16_t precomputed[bc405_n_asteroids * 3];
diff --git a/bias.cpp b/bias.cpp
index 27f442ab..10e309d1 100644
--- a/bias.cpp
+++ b/bias.cpp
@@ -82,7 +82,7 @@ int find_fcct_biases( const double ra, const double dec, const char catalog,
    const double j2000 = 2451545.;      /* JD 2451545.0 = 2000 Jan 1.5 */
    static bool bias_file_known_to_be_missing = false;
 
-   if( catalog == -1)    /* free up internal data */
+   if( catalog == (char)-1)    /* free up internal data */
       {
       if( bias_data)
          free( bias_data);
@@ -201,6 +201,8 @@ int find_fcct_biases( const double ra, const double dec, const char catalog,
          fclose( ofile);
          }
       }
+   if( n_cats == 26 && catalog_codes[25] == 'W')   /* fix a mistaken catalog */
+      catalog_codes[25] = 'Y';                /* code in pre-2023 EFCC files */
    if( !catalog)        /* just inquiring as to which version we have */
       return( n_cats == 26 ? 2018 : 2014);
    catalog_loc = strchr( catalog_codes, catalog);
diff --git a/bsdmake b/bsdmake
index 914d2a81..02a9b5df 100644
--- a/bsdmake
+++ b/bsdmake
@@ -159,7 +159,6 @@ clean_temp:
 	$(RM) $(IDIR)/elem_short.json
 	$(RM) $(IDIR)/ephemeri.txt
 	$(RM) $(IDIR)/ephemeri.json
-	$(RM) $(IDIR)/eph_json.txt
 	$(RM) $(IDIR)/gauss.out
 	$(RM) $(IDIR)/guide.txt
 	$(RM) $(IDIR)/guide?.txt
@@ -194,9 +193,9 @@ INSTALL_FILES= \
    bright.pgm bright2.pgm calendar.txt cometdef.sof command.txt cospar.txt \
    details.txt dosephem.txt dos_help.txt elem_pop.txt environ.def \
    eph2tle.txt eph_expl.txt eph_type.txt ?findorb.txt frame_he.txt \
-   geo_rect.txt header.htm jpl_eph.txt link_def.json mpc_area.txt \
+   geo_rect.txt header.htm hints.def jpl_eph.txt link_def.json mpc_area.txt \
    mpcorb.hdr mu1.txt nongravs.txt obj_help.txt obj_name.txt \
-   ObsCodes.htm ObsCodesF.html observer.txt obslinks.htm  \
+   ObsCodes.htm ObsCodesF.html observer.htm obslinks.htm  \
    odd_name.txt openfile.txt orbitdef.sof previous.def progcode.txt \
    radecfmt.txt residfmt.txt rovers.txt sat_xref.txt scope.json \
    scopes.txt splash.txt sigma.txt site_310.txt timehelp.txt xdesig.txt
@@ -212,7 +211,6 @@ install: all
 
 .endif
 	$(CP) $(INSTALL_FILES) $(IDIR)
-	$(CP) hints.txt $(IDIR)
 
 uninstall:
 .ifdef EXE
diff --git a/calendar.txt b/calendar.txt
index 0dd329f1..2ce35d55 100644
--- a/calendar.txt
+++ b/calendar.txt
@@ -1,155 +1,65 @@
-2022 11 5
-                              January 2022
-+----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
-+----------+----------+----------+----------+----------+----------+----------+
-| 30       | 31       |          |          |          |          |  1       |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
-|New Moon  |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
-|1st Qtr   |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
-|          |Full Moon |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
-|          |          |3rd Qtr   |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-
-                              February 2022
-+----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
-+----------+----------+----------+----------+----------+----------+----------+
-|          |          |  1       |  2       |  3       |  4       |  5       |
-|          |          |New Moon  |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
-|          |          |1st Qtr   |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
-|          |          |          |Full Moon |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
-|          |          |          |3rd Qtr   |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 27       | 28       |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-
-                              March 2022
+2023 11 5         See 'text_ca2.c' in the 'lunar' repository
+                              January 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |  1       |  2       |  3       |  4       |  5       |
-|          |          |          |New Moon  |          |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
-|          |          |          |          |1st Qtr   |          |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
 |          |          |          |          |          |Full Moon |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
-|          |          |          |          |          |3rd Qtr   |          |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 27       | 28       | 29       | 30       | 31       |          |          |
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-
-                              April 2022
-+----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
-+----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |          |          |  1       |  2       |
-|          |          |          |          |          |New Moon  |          |
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|3rd Qtr   |          |          |          |          |          |New Moon  |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
 |          |          |          |          |          |          |1st Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
-|          |          |          |          |          |          |Full Moon |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
-|          |          |          |          |          |          |3rd Qtr   |
+| 29       | 30       | 31       |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
-+----------+----------+----------+----------+----------+----------+----------+
-| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |          |          |          |          |          |New Moon  |
-|          |          |          |          |          |          |partial ec|
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              May 2022
+                              February 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|          |          |          |  1       |  2       |  3       |  4       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
-|          |1st Qtr   |          |          |          |          |          |
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|Full Moon |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
-|          |Full Moon |          |          |          |          |          |
-|          |total ecl |          |          |          |          |          |
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
-|3rd Qtr   |          |          |          |          |          |          |
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 29       | 30       | 31       |          |          |          |          |
-|          |New Moon  |          |          |          |          |          |
+| 26       | 27       | 28       |          |          |          |          |
+|          |1st Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              June 2022
+                              March 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -159,77 +69,77 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  5       |  6       |  7       |  8       |  9       | 10       | 11       |
-|          |          |1st Qtr   |          |          |          |          |
+|          |          |Full Moon |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 12       | 13       | 14       | 15       | 16       | 17       | 18       |
-|          |          |Full Moon |          |          |          |          |
-|          |          |          |          |          |          |          |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
+|          |          |π Day     |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 19       | 20       | 21       | 22       | 23       | 24       | 25       |
-|          |          |3rd Qtr   |          |          |          |          |
+|          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 26       | 27       | 28       | 29       | 30       |          |          |
-|          |          |          |New Moon  |          |          |          |
+| 26       | 27       | 28       | 29       | 30       | 31       |          |
+|          |          |          |1st Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              July 2022
+                              April 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-| 31       |          |          |          |          |  1       |  2       |
+| 30       |          |          |          |          |          |  1       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
-|          |          |          |          |1st Qtr   |          |          |
+|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
+|          |          |          |          |Full Moon |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
-|          |          |          |Full Moon |          |          |          |
+|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
+|          |          |          |          |3rd Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
-|          |          |          |3rd Qtr   |          |          |          |
-|          |          |          |          |          |          |          |
+| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
+|          |          |          |          |New Moon  |          |          |
+|          |          |          |          |hybrid ec |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |          |          |          |New Moon  |          |          |
+| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
+|          |          |          |          |1st Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              August 2022
+                              May 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |  1       |  2       |  3       |  4       |  5       |  6       |
-|          |          |          |          |          |1st Qtr   |          |
-|          |          |          |          |          |          |          |
+|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |penumb ecl|          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  7       |  8       |  9       | 10       | 11       | 12       | 13       |
-|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |3rd Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 14       | 15       | 16       | 17       | 18       | 19       | 20       |
-|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |          |New Moon  |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 21       | 22       | 23       | 24       | 25       | 26       | 27       |
-|          |          |          |          |          |          |New Moon  |
+|          |          |          |          |          |          |1st Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -239,37 +149,37 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              September 2022
+                              June 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |          |          |          |  1       |  2       |  3       |
-|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  4       |  5       |  6       |  7       |  8       |  9       | 10       |
-|          |          |          |          |          |          |Full Moon |
+|Full Moon |          |          |          |          |          |3rd Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 11       | 12       | 13       | 14       | 15       | 16       | 17       |
-|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 18       | 19       | 20       | 21       | 22       | 23       | 24       |
-|          |          |          |          |          |          |          |
+|New Moon  |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 25       | 26       | 27       | 28       | 29       | 30       |          |
-|New Moon  |          |          |          |          |          |          |
+|          |1st Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              October 2022
+                              July 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -279,108 +189,108 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  2       |  3       |  4       |  5       |  6       |  7       |  8       |
-|          |1st Qtr   |          |          |          |          |          |
+|          |Full Moon |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  9       | 10       | 11       | 12       | 13       | 14       | 15       |
-|Full Moon |          |          |          |          |          |          |
+|          |3rd Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 16       | 17       | 18       | 19       | 20       | 21       | 22       |
-|          |3rd Qtr   |          |          |          |          |          |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
-|Lucy flyby|          |          |          |          |          |          |
+|          |          |          |          |          |          |π Approx D|
 +----------+----------+----------+----------+----------+----------+----------+
 | 23       | 24       | 25       | 26       | 27       | 28       | 29       |
-|          |          |New Moon  |          |          |          |          |
-|          |          |partial ec|          |          |          |          |
+|          |          |1st Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              November 2022
+                              August 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |          |  1       |  2       |  3       |  4       |  5       |
-|          |          |1st Qtr   |          |          |          |          |
+|          |          |Full Moon |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  6       |  7       |  8       |  9       | 10       | 11       | 12       |
-|          |          |Full Moon |          |          |          |          |
-|          |          |total ec  |          |          |          |          |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 13       | 14       | 15       | 16       | 17       | 18       | 19       |
-|          |          |          |3rd Qtr   |          |          |          |
+|          |          |          |New Moon  |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 20       | 21       | 22       | 23       | 24       | 25       | 26       |
-|          |          |          |New Moon  |          |          |          |
+|          |          |          |          |1st Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 27       | 28       | 29       | 30       |          |          |          |
-|          |          |          |1st Qtr   |          |          |          |
+| 27       | 28       | 29       | 30       | 31       |          |          |
+|          |          |          |          |Full Moon |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              December 2022
+                              September 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |  1       |  2       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
-|          |          |          |          |Full Moon |          |          |
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
-|          |          |          |          |          |3rd Qtr   |          |
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+|          |          |          |          |          |New Moon  |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
-|          |          |          |          |          |New Moon  |          |
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |          |          |          |1st Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 25       | 26       | 27       | 28       | 29       | 30       | 31       |
-|          |          |          |          |          |1st Qtr   |          |
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |          |          |          |          |Full Moon |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              January 2023
+                              October 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |  1       |  2       |  3       |  4       |  5       |  6       |  7       |
-|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |3rd Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  8       |  9       | 10       | 11       | 12       | 13       | 14       |
-|          |          |          |          |          |          |          |
-|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |New Moon  |
+|          |          |          |          |          |          |annular ec|
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 15       | 16       | 17       | 18       | 19       | 20       | 21       |
-|3rd Qtr   |          |          |          |          |          |New Moon  |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 22       | 23       | 24       | 25       | 26       | 27       | 28       |
-|          |          |          |          |          |          |1st Qtr   |
-|          |          |          |          |          |          |          |
+|1st Qtr   |          |          |          |          |          |Full Moon |
+|          |          |          |          |          |          |umbral ecl|
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 29       | 30       | 31       |          |          |          |          |
@@ -389,7 +299,7 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              February 2023
+                              November 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -399,46 +309,706 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  5       |  6       |  7       |  8       |  9       | 10       | 11       |
-|Full Moon |          |          |          |          |          |          |
+|3rd Qtr   |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 12       | 13       | 14       | 15       | 16       | 17       | 18       |
-|          |3rd Qtr   |          |          |          |          |          |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 19       | 20       | 21       | 22       | 23       | 24       | 25       |
-|          |New Moon  |          |          |          |          |          |
+|          |1st Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 26       | 27       | 28       |          |          |          |          |
-|          |1st Qtr   |          |          |          |          |          |
+| 26       | 27       | 28       | 29       | 30       |          |          |
+|          |Full Moon |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              March 2023
+                              December 2023
 +----------+----------+----------+----------+----------+----------+----------+
 |  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |  1       |  2       |  3       |  4       |
+| 31       |          |          |          |          |  1       |  2       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
-|          |          |Full Moon |          |          |          |          |
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |3rd Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
-|          |          |          |3rd Qtr   |          |          |          |
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+|          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |1st Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |          |          |Full Moon |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              January 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |          |          |          |New Moon  |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|          |          |          |          |1st Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|          |          |          |          |Full Moon |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 28       | 29       | 30       | 31       |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              February 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
+|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+|          |          |          |          |          |1st Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
+|          |          |          |          |          |          |Full Moon |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 25       | 26       | 27       | 28       | 29       |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              March 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+| 31       |          |          |          |          |  1       |  2       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|3rd Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+|New Moon  |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |π Day     |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|1st Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |Full Moon |          |          |          |          |          |
+|          |penumb ecl|          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              April 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |New Moon  |          |          |          |          |          |
+|          |total ecl |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|          |          |Full Moon |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 28       | 29       | 30       |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              May 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |3rd Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |          |          |New Moon  |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |          |          |1st Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+|          |          |          |          |Full Moon |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 26       | 27       | 28       | 29       | 30       | 31       |          |
+|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              June 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+| 30       |          |          |          |          |          |  1       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
+|          |          |          |          |New Moon  |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
+|          |          |          |          |          |1st Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
+|          |          |          |          |          |          |Full Moon |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
+|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              July 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|Full Moon |          |          |          |          |          |          |
+|          |π Approx  |          |          |          |          |          |
+|          |   Day    |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 28       | 29       | 30       | 31       |          |          |          |
+|3rd Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              August 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
+|New Moon  |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
+|          |Full Moon |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 25       | 26       | 27       | 28       | 29       | 30       | 31       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              September 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|          |          |New Moon  |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|          |          |          |1st Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|          |          |          |Full Moon |          |          |          |
+|          |          |          |umbral ecl|          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 29       | 30       |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              October 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |  1       |  2       |  3       |  4       |  5       |
+|          |          |          |New Moon  |          |          |          |
+|          |          |          |annular ec|          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |          |1st Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|          |          |          |          |Full Moon |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 27       | 28       | 29       | 30       | 31       |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              November 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |          |  1       |  2       |
+|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                              December 2024
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|New Moon  |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|1st Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|Full Moon |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|3rd Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 29       | 30       | 31       |          |          |          |          |
+|          |New Moon  |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                 January 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |Full Moon |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 26       | 27       | 28       | 29       | 30       | 31       |          |
+|          |          |          |New Moon  |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                February 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |          |          |  1       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
+|          |          |          |1st Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
+|          |          |          |Full Moon |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
+|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 23       | 24       | 25       | 26       | 27       | 28       |          |
+|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                  March 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+| 30       | 31       |          |          |          |          |  1       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
+|          |          |          |          |1st Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
+|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
+|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
+|          |          |          |          |          |          |New Moon  |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                  April 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |  1       |  2       |  3       |  4       |  5       |
+|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|Full Moon |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 27       | 28       | 29       | 30       |          |          |          |
+|New Moon  |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                   May 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
+|1st Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+|          |Full Moon |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 25       | 26       | 27       | 28       | 29       | 30       | 31       |
+|          |          |New Moon  |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                  June 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|          |          |1st Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|          |          |          |Full Moon |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|          |          |          |3rd Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|          |          |          |New Moon  |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 29       | 30       |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                  July 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |  1       |  2       |  3       |  4       |  5       |
+|          |          |          |1st Qtr   |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |          |Full Moon |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+|          |          |          |          |New Moon  |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 27       | 28       | 29       | 30       | 31       |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                 August 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+| 31       |          |          |          |          |  1       |  2       |
+|1st Qtr   |          |          |          |          |1st Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |          |          |          |          |Full Moon |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |          |          |          |          |New Moon  |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                September 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|Full Moon |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|3rd Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|New Moon  |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 28       | 29       | 30       |          |          |          |          |
+|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                 October 2025
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |          |Full Moon |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
 |          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
@@ -449,9 +1019,9 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              April 2023
+                                November 2025
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 | 30       |          |          |          |          |          |  1       |
 |          |          |          |          |          |          |          |
@@ -459,42 +1029,42 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  2       |  3       |  4       |  5       |  6       |  7       |  8       |
-|          |          |          |          |Full Moon |          |          |
+|          |          |          |Full Moon |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  9       | 10       | 11       | 12       | 13       | 14       | 15       |
-|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 16       | 17       | 18       | 19       | 20       | 21       | 22       |
 |          |          |          |          |New Moon  |          |          |
-|          |          |          |          |hybrid ec |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 23       | 24       | 25       | 26       | 27       | 28       | 29       |
-|          |          |          |          |1st Qtr   |          |          |
+|          |          |          |          |          |1st Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              May 2023
+                                December 2025
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |  1       |  2       |  3       |  4       |  5       |  6       |
-|          |          |          |          |          |Full Moon |          |
-|          |          |          |          |          |penumb ecl|          |
+|          |          |          |          |Full Moon |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  7       |  8       |  9       | 10       | 11       | 12       | 13       |
-|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |3rd Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 14       | 15       | 16       | 17       | 18       | 19       | 20       |
-|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |New Moon  |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -509,17 +1079,17 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              June 2023
+                                 January 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |          |          |          |  1       |  2       |  3       |
-|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |Full Moon |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  4       |  5       |  6       |  7       |  8       |  9       | 10       |
-|Full Moon |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |3rd Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -533,135 +1103,165 @@
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 25       | 26       | 27       | 28       | 29       | 30       |          |
+| 25       | 26       | 27       | 28       | 29       | 30       | 31       |
 |          |1st Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              July 2023
+                                February 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-| 30       | 31       |          |          |          |          |  1       |
-|          |          |          |          |          |          |          |
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|Full Moon |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
-|          |Full Moon |          |          |          |          |          |
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|          |3rd Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
-|          |3rd Qtr   |          |          |          |          |          |
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
-|          |New Moon  |          |          |          |          |          |
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|          |          |1st Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
-|          |          |1st Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              August 2023
+                                  March 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |  1       |  2       |  3       |  4       |  5       |
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
 |          |          |Full Moon |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
-|          |          |3rd Qtr   |          |          |          |          |
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
-|          |          |          |New Moon  |          |          |          |
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|          |          |          |          |New Moon  |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
-|          |          |          |          |1st Qtr   |          |          |
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|          |          |          |1st Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 27       | 28       | 29       | 30       | 31       |          |          |
-|          |          |          |          |Full Moon |          |          |
+| 29       | 30       | 31       |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              September 2023
+                                  April 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |          |          |  1       |  2       |
-|          |          |          |          |          |          |          |
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |          |Full Moon |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
-|          |          |          |3rd Qtr   |          |          |          |
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |          |          |          |          |3rd Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
 |          |          |          |          |          |New Moon  |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
 |          |          |          |          |          |1st Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |          |          |          |          |Full Moon |          |
+| 26       | 27       | 28       | 29       | 30       |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              October 2023
+                                   May 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
-|          |          |          |          |          |3rd Qtr   |          |
+| 31       |          |          |          |          |  1       |  2       |
+|Full Moon |          |          |          |          |Full Moon |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
 |          |          |          |          |          |          |New Moon  |
-|          |          |          |          |          |          |annular ec|
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
-|1st Qtr   |          |          |          |          |          |Full Moon |
-|          |          |          |          |          |          |umbral ecl|
+
+                                  June 2026
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 29       | 30       | 31       |          |          |          |          |
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|1st Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 28       | 29       | 30       |          |          |          |          |
+|          |Full Moon |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              November 2023
+                                  July 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |          |          |  1       |  2       |  3       |  4       |
 |          |          |          |          |          |          |          |
@@ -669,158 +1269,248 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  5       |  6       |  7       |  8       |  9       | 10       | 11       |
-|3rd Qtr   |          |          |          |          |          |          |
+|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |          |New Moon  |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+|          |          |1st Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 26       | 27       | 28       | 29       | 30       | 31       |          |
+|          |          |          |Full Moon |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                 August 2026
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+| 30       | 31       |          |          |          |          |  1       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  2       |  3       |  4       |  5       |  6       |  7       |  8       |
+|          |          |          |          |3rd Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  9       | 10       | 11       | 12       | 13       | 14       | 15       |
+|          |          |          |New Moon  |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 16       | 17       | 18       | 19       | 20       | 21       | 22       |
+|          |          |          |          |1st Qtr   |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 23       | 24       | 25       | 26       | 27       | 28       | 29       |
+|          |          |          |          |          |Full Moon |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                September 2026
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |  1       |  2       |  3       |  4       |  5       |
+|          |          |          |          |          |3rd Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |          |          |New Moon  |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|          |          |          |          |          |1st Qtr   |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+|          |          |          |          |          |          |Full Moon |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 27       | 28       | 29       | 30       |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+
+                                 October 2026
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
+|          |          |          |          |          |          |New Moon  |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
-|          |New Moon  |          |          |          |          |          |
+| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
-|          |1st Qtr   |          |          |          |          |          |
+| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
+|1st Qtr   |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 26       | 27       | 28       | 29       | 30       |          |          |
+| 25       | 26       | 27       | 28       | 29       | 30       | 31       |
 |          |Full Moon |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              December 2023
+                                November 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-| 31       |          |          |          |          |  1       |  2       |
-|          |          |          |          |          |          |          |
+|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
+|3rd Qtr   |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
-|          |          |3rd Qtr   |          |          |          |          |
+|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
-|          |          |New Moon  |          |          |          |          |
+| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+|          |          |1st Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
-|          |          |1st Qtr   |          |          |          |          |
+| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+|          |          |Full Moon |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |          |          |Full Moon |          |          |          |
+| 29       | 30       |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              January 2024
+                                December 2026
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |  1       |  2       |  3       |  4       |  5       |  6       |
-|          |          |          |          |3rd Qtr   |          |          |
+|          |          |  1       |  2       |  3       |  4       |  5       |
+|          |          |3rd Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
-|          |          |          |          |New Moon  |          |          |
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |New Moon  |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
 |          |          |          |          |1st Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
 |          |          |          |          |Full Moon |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 28       | 29       | 30       | 31       |          |          |          |
-|          |          |          |          |          |          |          |
+| 27       | 28       | 29       | 30       | 31       |          |          |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              February 2024
+                                 January 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |          |  1       |  2       |  3       |
-|          |          |          |          |          |3rd Qtr   |          |
+| 31       |          |          |          |          |  1       |  2       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
-|          |          |          |          |          |New Moon  |          |
+|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
+|          |          |          |          |New Moon  |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
 |          |          |          |          |          |1st Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
-|          |          |          |          |          |          |Full Moon |
+| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
+|          |          |          |          |          |Full Moon |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 25       | 26       | 27       | 28       | 29       |          |          |
-|          |          |          |          |          |          |          |
+| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
+|          |          |          |          |          |3rd Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              March 2024
+                                February 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-| 31       |          |          |          |          |  1       |  2       |
-|          |          |          |          |          |          |          |
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |          |          |New Moon  |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  3       |  4       |  5       |  6       |  7       |  8       |  9       |
-|3rd Qtr   |          |          |          |          |          |          |
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 10       | 11       | 12       | 13       | 14       | 15       | 16       |
-|New Moon  |          |          |          |          |          |          |
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
+|1st Qtr   |          |          |          |          |          |Full Moon |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 17       | 18       | 19       | 20       | 21       | 22       | 23       |
-|1st Qtr   |          |          |          |          |          |          |
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |Full Moon |          |          |          |          |          |
-|          |penumb ecl|          |          |          |          |          |
+| 28       |          |          |          |          |          |          |
+|3rd Qtr   |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              April 2024
+                                  March 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |  1       |  2       |  3       |  4       |  5       |  6       |
-|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  7       |  8       |  9       | 10       | 11       | 12       | 13       |
 |          |New Moon  |          |          |          |          |          |
-|          |total ecl |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 14       | 15       | 16       | 17       | 18       | 19       | 20       |
@@ -829,51 +1519,51 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 21       | 22       | 23       | 24       | 25       | 26       | 27       |
-|          |          |Full Moon |          |          |          |          |
+|          |Full Moon |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 28       | 29       | 30       |          |          |          |          |
-|          |          |          |          |          |          |          |
+| 28       | 29       | 30       | 31       |          |          |          |
+|          |          |3rd Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              May 2024
+                                  April 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |  1       |  2       |  3       |  4       |
-|          |          |          |3rd Qtr   |          |          |          |
+|          |          |          |          |  1       |  2       |  3       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
-|          |          |          |New Moon  |          |          |          |
+|  4       |  5       |  6       |  7       |  8       |  9       | 10       |
+|          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
-|          |          |          |1st Qtr   |          |          |          |
+| 11       | 12       | 13       | 14       | 15       | 16       | 17       |
+|          |          |1st Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
-|          |          |          |          |Full Moon |          |          |
+| 18       | 19       | 20       | 21       | 22       | 23       | 24       |
+|          |          |Full Moon |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 26       | 27       | 28       | 29       | 30       | 31       |          |
-|          |          |          |          |3rd Qtr   |          |          |
+| 25       | 26       | 27       | 28       | 29       | 30       |          |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              June 2024
+                                   May 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-| 30       |          |          |          |          |          |  1       |
+| 30       | 31       |          |          |          |          |  1       |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
@@ -884,12 +1574,12 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  9       | 10       | 11       | 12       | 13       | 14       | 15       |
-|          |          |          |          |          |1st Qtr   |          |
+|          |          |          |          |1st Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 16       | 17       | 18       | 19       | 20       | 21       | 22       |
-|          |          |          |          |          |          |Full Moon |
+|          |          |          |          |Full Moon |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -899,39 +1589,39 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              July 2024
+                                  June 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |  1       |  2       |  3       |  4       |  5       |
 |          |          |          |          |          |New Moon  |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
-|          |          |          |          |          |          |1st Qtr   |
+|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
+|          |          |          |          |          |1st Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
-|          |          |          |          |          |          |          |
+| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
+|          |          |          |          |          |          |Full Moon |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
-|Full Moon |          |          |          |          |          |          |
+| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 28       | 29       | 30       | 31       |          |          |          |
+| 27       | 28       | 29       | 30       |          |          |          |
 |3rd Qtr   |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              August 2024
+                                  July 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |          |          |          |          |  1       |  2       |  3       |
 |          |          |          |          |          |          |          |
@@ -939,17 +1629,17 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  4       |  5       |  6       |  7       |  8       |  9       | 10       |
-|New Moon  |          |          |          |          |          |          |
+|New Moon  |          |          |          |          |          |1st Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 11       | 12       | 13       | 14       | 15       | 16       | 17       |
-|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 18       | 19       | 20       | 21       | 22       | 23       | 24       |
-|          |Full Moon |          |          |          |          |          |
+|Full Moon |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -959,77 +1649,77 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              September 2024
+                                 August 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
 |  1       |  2       |  3       |  4       |  5       |  6       |  7       |
-|          |          |New Moon  |          |          |          |          |
+|          |New Moon  |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  8       |  9       | 10       | 11       | 12       | 13       | 14       |
-|          |          |          |1st Qtr   |          |          |          |
+|          |1st Qtr   |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 15       | 16       | 17       | 18       | 19       | 20       | 21       |
-|          |          |          |Full Moon |          |          |          |
-|          |          |          |umbral ecl|          |          |          |
+|          |          |Full Moon |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 22       | 23       | 24       | 25       | 26       | 27       | 28       |
-|          |          |3rd Qtr   |          |          |          |          |
+|          |          |          |3rd Qtr   |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 29       | 30       |          |          |          |          |          |
-|          |          |          |          |          |          |          |
+| 29       | 30       | 31       |          |          |          |          |
+|          |          |New Moon  |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              October 2024
+                                September 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |  1       |  2       |  3       |  4       |  5       |
-|          |          |          |New Moon  |          |          |          |
-|          |          |          |annular ec|          |          |          |
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  6       |  7       |  8       |  9       | 10       | 11       | 12       |
-|          |          |          |          |1st Qtr   |          |          |
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |          |1st Qtr   |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 13       | 14       | 15       | 16       | 17       | 18       | 19       |
-|          |          |          |          |Full Moon |          |          |
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |          |          |Full Moon |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 20       | 21       | 22       | 23       | 24       | 25       | 26       |
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
 |          |          |          |          |3rd Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 27       | 28       | 29       | 30       | 31       |          |          |
-|          |          |          |          |          |          |          |
+| 26       | 27       | 28       | 29       | 30       |          |          |
+|          |          |          |          |New Moon  |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              November 2024
+                                 October 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|          |          |          |          |          |  1       |  2       |
-|          |          |          |          |          |New Moon  |          |
+| 31       |          |          |          |          |  1       |  2       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 |  3       |  4       |  5       |  6       |  7       |  8       |  9       |
-|          |          |          |          |          |          |1st Qtr   |
+|          |          |          |          |1st Qtr   |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
@@ -1039,43 +1729,72 @@
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 17       | 18       | 19       | 20       | 21       | 22       | 23       |
-|          |          |          |          |          |          |3rd Qtr   |
+|          |          |          |          |          |3rd Qtr   |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 | 24       | 25       | 26       | 27       | 28       | 29       | 30       |
-|          |          |          |          |          |          |          |
+|          |          |          |          |          |New Moon  |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
-                              December 2024
+                                November 2027
 +----------+----------+----------+----------+----------+----------+----------+
-|  Sunday  |  Monday  |  Tuesday |Wednesday | Thursday |  Friday  | Saturday |
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
 +----------+----------+----------+----------+----------+----------+----------+
-|  1       |  2       |  3       |  4       |  5       |  6       |  7       |
-|New Moon  |          |          |          |          |          |          |
+|          |  1       |  2       |  3       |  4       |  5       |  6       |
+|          |          |          |          |          |          |1st Qtr   |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-|  8       |  9       | 10       | 11       | 12       | 13       | 14       |
-|1st Qtr   |          |          |          |          |          |          |
+|  7       |  8       |  9       | 10       | 11       | 12       | 13       |
+|          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 15       | 16       | 17       | 18       | 19       | 20       | 21       |
+| 14       | 15       | 16       | 17       | 18       | 19       | 20       |
 |Full Moon |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 22       | 23       | 24       | 25       | 26       | 27       | 28       |
+| 21       | 22       | 23       | 24       | 25       | 26       | 27       |
 |3rd Qtr   |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
-| 29       | 30       | 31       |          |          |          |          |
-|          |New Moon  |          |          |          |          |          |
+| 28       | 29       | 30       |          |          |          |          |
+|New Moon  |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 |          |          |          |          |          |          |          |
 +----------+----------+----------+----------+----------+----------+----------+
 
+                                December 2027
++----------+----------+----------+----------+----------+----------+----------+
+|  Sunday  |  Monday  | Tuesday  |Wednesday | Thursday |  Friday  | Saturday |
++----------+----------+----------+----------+----------+----------+----------+
+|          |          |          |  1       |  2       |  3       |  4       |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+|  5       |  6       |  7       |  8       |  9       | 10       | 11       |
+|          |1st Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 12       | 13       | 14       | 15       | 16       | 17       | 18       |
+|          |Full Moon |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 19       | 20       | 21       | 22       | 23       | 24       | 25       |
+|          |3rd Qtr   |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
+| 26       | 27       | 28       | 29       | 30       | 31       |          |
+|          |New Moon  |          |          |          |          |          |
+|          |          |          |          |          |          |          |
+|          |          |          |          |          |          |          |
++----------+----------+----------+----------+----------+----------+----------+
diff --git a/clipfunc.cpp b/clipfunc.cpp
index e7d3a702..c3b758f6 100644
--- a/clipfunc.cpp
+++ b/clipfunc.cpp
@@ -18,13 +18,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.    */
 
 #include <stdio.h>
-
-#ifdef _WIN32
-#include <windows.h>
+#include "watdefs.h"
 
 int copy_buffer_to_clipboard( const char *contents, const long length);
 int copy_file_to_clipboard( const char *filename);    /* clipfunc.cpp */
-int clipboard_to_file( const char *filename, const int append); /* clipfunc.cpp */
+int clipboard_to_file( const char *filename, const int append,
+                           const bool use_selection); /* clipfunc.cpp */
+
+#ifdef _WIN32
+#include <windows.h>
 
       /* Following is copied shamelessly from pdcclip.c from PDCurses. */
       /* With one strange addition:  "solo" line feeds are expanded to */
@@ -109,10 +111,13 @@ int copy_file_to_clipboard( const char *filename)
    return( rval);
 }
 
-int clipboard_to_file( const char *filename, const int append)
+int clipboard_to_file( const char *filename, const int append,
+                                          const bool use_selection)
 {
     int rval;
 
+            /* sadly,  we can't get at the selected text in MSWin */
+    INTENTIONALLY_UNUSED_PARAMETER( use_selection);
     if( !OpenClipboard(NULL))
         rval =  -1;
     else
@@ -143,12 +148,14 @@ int clipboard_to_file( const char *filename, const int append)
 #include <stdlib.h>
 #include "curses.h"
 
-int clipboard_to_file( const char *filename, const int append)
+int clipboard_to_file( const char *filename, const int append,
+                                          const bool use_selection)
 {
    long size = -99;
    char *contents;
    int err_code;
 
+   INTENTIONALLY_UNUSED_PARAMETER( use_selection);
    err_code = PDC_getclipboard( &contents, &size);
    if( err_code == PDC_CLIP_SUCCESS)
       {
@@ -191,11 +198,14 @@ int copy_file_to_clipboard( const char *filename)
 #else    /* non-PDCurses, non-Windows:  use xclip */
 #include <stdlib.h>
 
-int clipboard_to_file( const char *filename, const int append)
+int clipboard_to_file( const char *filename, const int append,
+                                          const bool use_selection)
 {
    char cmd[80];
 
-   snprintf( cmd, sizeof( cmd), "xclip -o >%c %s", (append ? '>' : ' '), filename);
+   snprintf( cmd, sizeof( cmd), "xclip -o %s >%c %s",
+            (use_selection ? "" : "-se c"),
+            (append ? '>' : ' '), filename);
    return( system( cmd));
 }
 
diff --git a/collide.cpp b/collide.cpp
index 50ab990c..741cd663 100644
--- a/collide.cpp
+++ b/collide.cpp
@@ -1,4 +1,4 @@
-/* orb_func.cpp: computes when/where an object hits a planet or moon
+/* collide.cpp: computes when/where an object hits a planet or moon
 
 Copyright (C) 2010, Project Pluto
 
diff --git a/command.txt b/command.txt
index 1a678611..846faf91 100644
--- a/command.txt
+++ b/command.txt
@@ -1,35 +1,41 @@
 q              Quit
+.              About
 o              Open...
 n              NewObj
-F16 (shift-f4) AddObj
+O              AddObj
 m              epheM
 f              Full
 h              Herget
 v              Vaisa
 d              resiD
+}              ResidFmt
+Alt-L          Language
 g              Gauss
 l              constr
 e              Epoch
 !              all_perts
 u              Undo
+{              FilterObs
 *              NonGravs
 c              Calend
-+              HelioOnly
++              OrbCenter
 -              Obs'ories
 x              ToggObs
 =              MagResids
+j              MagType
 w              Worst
 #              Simplex
 /              Superplex
 :              Linearize
 |              MonteCarlo
 [              CovarData
-`              CmtMags
-Ctrl-W         ToggUp
-F2             ToggDn
+Ctrl-Dn        NextOpp
+Ctrl-Up        PrevOpp
+Shift-Up       ToggUp
+Shift-Dn       ToggDn
 Ctrl-Y         BanObs
 Ctrl-X         SaveOrbs
-)              ReadFile
+)              ShowFile
 End
    Color assignments (foreground,  then background,  in hex form)
    These apply to Windows Find_Orb and most modern Linux/*BSD/OS/X systems.
@@ -82,13 +88,14 @@ End colors
 
 Start hints
 
+.              Splash screen/Find_Orb version info
 b              Select format for observation times
 c              Show calendar
 r              Enter dist to object at start and end of arc
 q              Quit Find_Orb
 o              Open a file of astrometry
 n              Select a different object from the file
-F16 (shift-F4) Add astrometry for a different object
+O              Add astrometry for a different object
 m              Generate ephemerides
 f              Do a full least-squares improvement of the orbit
 h              Compute an orbit using the method of Herget
@@ -104,13 +111,14 @@ u              Undo (go back to previous orbit)
 -              Change the number of observatories shown at bottom
 x              Toggle currently selected observation(s) on/off
 =              Toggle display of magnitude residuals
+j              Cycle magnitude model from asteroid to comet nuclear to comet total
 w              Show included observation with the worst residuals
 #              Apply the 'simplex' orbit improvement method
 /              Apply the 'superplex' orbit improvement method
 :              Linearize the orbit
 |              Compute Monte Carlo variant orbits
 [              Show the covariance and some debugging data
-`              Toggle comet mags between nuclear M(N) and total M(T)
+{              Toggle obs on below a desired residual level,  off above it
 )              Select a file and show it on-screen
 0              Toggle lunar perturbations
 1              Toggle perturbations from Mercury
@@ -124,6 +132,7 @@ w              Show included observation with the worst residuals
 9              Toggle perturbations from Pluto
 a              Toggle perturbations from asteroids
 t              Select how residuals are shown
+Alt-L          Select display language
 Alt-K          Toggle display of uncertainties
 Alt-N          Select frame for orbital elements
 Alt-R          Set reference for orbital elements
@@ -131,6 +140,10 @@ Alt-X          Find next obs with a desired MPC code
 U+9            Toggle sort obs by date vs. sort by MPC code
 U+31004        Add a line of menu options
 U+31005        Remove last line of menu options
+Ctrl-Dn        Find first observation in the next opposition
+Ctrl-Up        Find last observation from the previous opposition
+Shift-Up       Toggle all observations above the selected one
+Shift-Dn       Toggle all observations below the selected one
 ?              Get help
 %              Set uncertainties for the selected observation(s)
 &              Select format for observation RA/decs
@@ -139,3 +152,16 @@ F2             Toggle observations below the currently selected one
 Ctrl-X         Save orbits for re-use
 Ctrl-Y         Write excluded observations to be 'banned'
 Ctrl-G         Set magnitude slope parameter (G)
+U+31008        Left-click to select tracklet, right to toggle it
+}              Cycle precision in which residuals are shown
+
+Start remaps :
+    ; PuTTY doesn't recognize Shift-Up or Shift-Dn (just returns the same key
+    ; codes as Up and Down).  For Alt-Dn,  Alt-Up,  Alt-Lt, Alt-Rt,  it returns
+    ; codes 4354 to 4357.  The following remaps Alt-Dn (for PuTTY) to Shift-Dn,
+    ; and Alt-Up to Shift-Up,  and will toggle observations below/above the
+    ; currently selected one.  Other key remaps may be added here as needed...
+U+4354         Shift-Dn
+U+4355         Shift-Up
+  U+4356         Alt-Lt    (not currently used)
+  U+4357         Alt-Rt    (not currently used)
diff --git a/constant.h b/constant.h
index 3ace4d4c..91def885 100644
--- a/constant.h
+++ b/constant.h
@@ -3,6 +3,7 @@
 #define J2000 2451545.
 #define JD_TO_YEAR( jd)  (2000. + ((jd) - J2000) / 365.25)
 #define YEAR_TO_JD( year) (J2000 + (year - 2000.) * 365.25)
+#define METERS_PER_KM      1000.
 
 #define PI 3.1415926535897932384626433832795028841971693993751058209749445923078
 
@@ -13,10 +14,18 @@
 
 #define EARTH_RADIUS_IN_KM    6378.140
 #define SUN_RADIUS_IN_KM      695700.
+#define LUNAR_RADIUS_IN_KM    1737.4
 #define EARTH_RADIUS_IN_AU    (EARTH_RADIUS_IN_KM / AU_IN_KM)
 #define SUN_RADIUS_IN_AU      (SUN_RADIUS_IN_KM / AU_IN_KM)
+#define LUNAR_RADIUS_IN_AU    (LUNAR_RADIUS_IN_KM / AU_IN_KM)
 
-const double SRP1AU = 2.3e-7;
+/* "Solar constant" : at one AU from the sun,  a square meter
+collects 1361 watts (total solar irradiance at all wavelengths). */
+
+#define SOLAR_CONSTANT     1361.       /* W/m^2 = kg/s^3 at one AU */
+
+const double SRP1AU = SOLAR_CONSTANT * seconds_per_day * seconds_per_day
+                            / (AU_IN_METERS * SPEED_OF_LIGHT * METERS_PER_KM);
 
 /* "Solar radiation pressure at 1 AU",  in kg*AU^3 / (m^2*d^2),
 from a private communication from Steve Chesley.  This means
@@ -25,32 +34,11 @@ meter of surface area to the sun,  and it was one AU from the
 sun,  and it absorbed all the solar radiation (and re-radiated
 it isotropically;  i.e.,  the re-radiated photons didn't cause
 any net force),  then that object would accelerate away from
-the sun at 2.3e-7 AU/day^2 (a.k.a. 4.562e-6 m/s^2).
-
-  One can derive SRP1AU  from basic principles.   The 'solar
-constant' is C = 1367.6 AU^2*W/m^2; i.e.,  if you set up a
-one square meter solar panel with 100% efficiency one AU from
-the Sun, pointed straight at the sun, it would generate
-1367.6 watts. To get the above number, one uses
-
-SRP1AU = C * d^2 / (meters_per_AU * c)
-
-   C = 1367.6 AU^2*W/m^2 = 1367.6 AU^2*kg/s^3
-   d = 86400 seconds/day
-   meters_per_AU = 1495978707 m/AU
-   c = 299792458 m/s
-
-   The result indicates that if the solar panel in question
-had a mass of one kilogram,  it would accelerate away from the
-sun at 2.27636e-7 AU/day^2.  I think Steve rounded off with a
-one-percent error because that's a decent match to the accuracy
-you can expect with real-world objects that reflect and re-radiate
-photons,  instead of politely absorbing them and then re-radiating
-them isotropically.
+the sun at about 2.3e-7 AU/day^2 (a.k.a. 4.6e-6 m/s^2).
 
-  Interestingly,  this also means that an object with area/mass =
-1286 m^2/kg would have SRP balancing the sun's gravity.  Which
-would make it big and light.  Solar sails aren't easy.
+   Reality will not be so precise;  real objects reflect and
+re-radiate photons,  instead of politely absorbing them and
+then re-radiating them isotropically.
 
     A final comment : non-gravs of the A1, A2, A3 form give the
 acceleration the object would have at one AU from the sun,  in
diff --git a/cospar.txt b/cospar.txt
index 3d4f6e8f..c4636223 100644
--- a/cospar.txt
+++ b/cospar.txt
@@ -131,7 +131,7 @@ Obj: 4001 # Phobos (s)
    r=13.0,11.4,9.1
    a0 = 317.67071657 -0.10844326T -1.78428399 sin M1 +0.02212824 sin M2
    d0 =  52.88627266 -0.06134706T -1.07516537 cos M1 +0.00668626 cos M2
-   W  =  34.9964842535 +1128.84475928d + 12.72192797 T2 + 1.42421769 sin M1 - 0.02273783 sin M2 + 1.145 sin M5
+   W  =  35.18774440 +1128.84475928d + 12.72192797 T2 + 1.42421769 sin M1 - 0.02273783 sin M2 - 1.145 sin M5
 
 Obj: 4002 # Deimos (s)
    r=7.8,6.0,5.1
@@ -788,3 +788,8 @@ alternative (orientations from DE-4xx) would be overkill.
 
    (2022 Feb 02) Added some planetary radii,  for future use.
    (2022 Oct 06) Added still more planetary radii.
+
+   (2023 Jan 24) Two corrections for the equation for W for Phobos,  from
+_Celestial Mechanics & Dynamical Astronomy_, 131, 12.
+
+   https://rdcu.be/b32WL     doi: 10.1007/s10569-019-9925-1
diff --git a/cssfield.cpp b/cssfield.cpp
index 229e433a..98404b97 100644
--- a/cssfield.cpp
+++ b/cssfield.cpp
@@ -325,12 +325,22 @@ static void get_field_size( double *width, double *height, const double jd,
       case 1412:        /* (E12) Siding Spring */
          *width = 2.05;
          break;
+      case 1551:        /* (F51) PanSTARRS 1 */
+      case 1552:        /* (F52) PanSTARRS 2 */
+         *width = 3.2;
+         break;
       case 1852:        /* I52:  33' field of view;  some loss in corners */
          *width = 33. / 60.;
          break;
+      case 1904:       /* J04 */
+         *width = 1.122;      /* not sure of this... Marco Micheli says 44'? */
+         break;
       case 1995:       /* J95:  25' to 2005 jun 22, 18' for 2005 jun 27 on */
          *width = (jd < jun_24_2005 ? 25. / 60. : 18. / 60.);
          break;
+      case 2222:          /* (M22) ATLAS South Africa */
+         *width = 7.354;
+         break;
       case 2905:         /* ATLAS (T05), (T08) : 7.4 degree FOV */
       case 2908:
          *width = 7.4;
@@ -341,6 +351,9 @@ static void get_field_size( double *width, double *height, const double jd,
       case 3106:          /* (V06) */
          *width = 580. / 3600.;
          break;
+      case 3268:          /* (W68) ATLAS Chile */
+         *width = 7.354;
+         break;
       default:
          *width = 0.;
          if( memcmp( bad_code, obs_code, 4))
@@ -428,7 +441,7 @@ int main( const int argc, const char **argv)
       {
       FILE *ifile;
 
-      sprintf( buff, "css%d.csv", file_number);
+      snprintf( buff, sizeof( buff), "css%d.csv", file_number);
       ifile = fopen( buff, "rb");
       if( ifile)
          {
@@ -437,7 +450,7 @@ int main( const int argc, const char **argv)
          int n_invalid_fields = 0;
          FILE *ofile;
 
-         sprintf( buff, "css_%d.csv", file_number);
+         snprintf( buff, sizeof( buff), "css_%d.csv", file_number);
          ofile = fopen( buff, "wb");
 
          printf( "%s opened;  reading fields\n", buff);
diff --git a/curs_lin.h b/curs_lin.h
index 4dcf5ea6..052da5e6 100644
--- a/curs_lin.h
+++ b/curs_lin.h
@@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define ALT_RIGHT     0x22d
 #define ALT_LEFT      0x21e
 #define ALT_UP        0x233
-#define ALT_DN        0x20a
+#define ALT_DOWN      0x20a
 // #define CTL_LEFT      (ALT_BASE + 257)
 // #define CTL_RIGHT     (ALT_BASE + 258)
 // #define CTL_PGUP      (ALT_BASE + 259)
@@ -105,7 +105,7 @@ something I've just not figured out yet.      */
 #define ALT_RIGHT     0x22e
 #define ALT_LEFT      0x21f
 #define ALT_UP        0x234
-#define ALT_DN        0x20b
+#define ALT_DOWN      0x20b
 
 #define ALT_DEL       0x205
 #define ALT_INS       0x21a
diff --git a/details.cpp b/details.cpp
index ab0f5b01..1edece25 100644
--- a/details.cpp
+++ b/details.cpp
@@ -185,6 +185,8 @@ int add_line_to_observation_details( void *obs_details, const char *iline)
 
    if( !memcmp( iline, "COM Sigmas", 10))    /* skip ADES comment lines */
       return( OBS_DETAILS_IRRELEVANT_LINE);
+   if( !memcmp( iline, "COM vel (km/s)", 14))    /* skip spacecraft velocity lines */
+      return( OBS_DETAILS_IRRELEVANT_LINE);
    while( len && (iline[len - 1] == 10 || iline[len - 1] == 13))
       len--;               /* drop trailing carriage returns/line feeds */
    if( !memcmp( iline, "COD ", 4))
diff --git a/details.txt b/details.txt
index baf1d10a..a1f90bfa 100644
--- a/details.txt
+++ b/details.txt
@@ -24,7 +24,13 @@ but that others also use it and I've no way of knowing which details
 ought to be shown.  (For example,  (568) Mauna Kea has eleven scopes
 and a bazillion observers;  I've no idea what to show there.)
 
-2021 Aug 14 version
+2025 Apr 9 version
+
+COD 006
+MEA A. Bernal, J. Nunez, N. Torras
+OBS A. Bernal, J. M. Codina, J. Nunez, N. Torras
+COM Default details extracted from MPEC 2024-D33
+TEL 0.35-m f/11 Schmidt-Cassegrain + CCD
 
 COD 033
 MEA B. Stecklum
@@ -32,6 +38,12 @@ OBS S. Melnikov, C. Hoegner, B. Stecklum
 COM Default details extracted from MPEC 2021-C313
 TEL 1.34-m f/3 Schmidt + CCD
 
+COD 046
+MEA M. Tichy, M. Honkova
+OBS M. Tichy, M. Janda, J. Ticha, M. Honkova
+COM Default details extracted from MPEC 2023-D41
+TEL 0.57-m f/5.2 Reflector + 4096x4096 CMOS
+
 COD 048
 COM Find_Orb default details
 OBS M. Lekhy
@@ -59,12 +71,26 @@ OBS A. Sonka, A. Nedelcu
 COM Default details extracted from MPEC 2021-B143
 TEL 0.50-m f/8 Ritchey-Chretien + CCD
 
+COD 074
+COM Default details extracted from MPEC 2023-F148
+TEL 0.042-m camera
+
+COD 076
+COM Default details extracted from MPEC 2023-F148
+TEL 0.25-m Franklin-Adams Star Camera
+
 COD 084
 COM Find_Orb default details
 OBS A. V. Devyatkin, D. L. Gorshanov, V. V. Kouprianov,  M. Yu. Sidorov
 MEA A. V. Devyatkin, G. D. Baturina, A. V. Lemeseva, N. V. Mikhailova
 TEL 0.32-m f/3.2 reflector + CCD
 
+COD 088
+OBS A. Taky, M. Aboueisha
+MEA L. Elenin
+COM Default details extracted from MPEC 2024-D56
+TEL 1.88-m f/4.9 reflector + CCD
+
 COD 089
 MEA N. V. Maigurova, L. E. Bondarchuk
 OBS S. V. Protsyuk, O. G. Sergienko, V. F. Kryuchkovsky, M. P. Kalyuzhny
@@ -129,6 +155,12 @@ COM Default details extracted from MPEC 2020-E26
 MEA V. Jelic
 TEL 0.41-m f/4.3 reflector + CCD
 
+COD 126
+OBS L. Sannino, A. Mancuso, S. Mercanti, D. Agnetti
+MEA L. Sannino, A. Mancuso
+COM Default details extracted from MPEC 2024-P161
+TEL 0.41-m f/5.3 reflector + CCD
+
 COD 127
 COM Find_Orb default details
 OBS N. Ehring
@@ -147,8 +179,8 @@ TEL 0.35-m f/5.5 reflector + CCD
 
 COD 151
 COM Find_Orb default details
-OBS M. Griesser
-TEL 0.40-m f/5.8 Hypergraph + CCD
+OBS D. Luongo
+TEL 0.6-m f/3.8 Astrograph + CCD
 
 COD 152
 MEA K. Cernis
@@ -177,11 +209,21 @@ COD 170
 COM Find_Orb default details
 OBS J. Manteca
 
+COD 171
+OBS S. M. Brincat
+COM Default details extracted from MPEC 2024-B140
+TEL 0.25-m f/6.3 SCT + CCD
+
 COD 178
 OBS J.-G. Bosch
 COM Default details extracted from MPEC 2021-F115
 TEL 0.08-m f/6 refractor + CCD
 
+COD 179
+OBS D. Buczynski
+COM Default details extracted from MPEC 2024-A43
+TEL 0.43-m f/6.9 CDK + CCD
+
 COD 181
 COM Default details extracted from MPEC 2022-R91
 OBS T. Santana-Ros, M. Micheli, L. Conversi, J. Berthier, F. Vachier, P. Descamps
@@ -209,6 +251,11 @@ OBS G. Rhemann
 COM Default details extracted from MPEC 2021-A190
 TEL 0.3-m f/3.6 reflector + CCD
 
+COD 196
+OBS W. Wiedemann
+COM Default details extracted from MPEC 2023-N01
+TEL 0.28-m f/4.3 Schmidt-Cassegrain + CCD
+
 COD 201
 OBS V. Pozzoli
 COM Default details extracted from MPEC 2020-L06
@@ -276,15 +323,26 @@ COM Default details extracted from MPEC 2021-C313
 TEL 1.06-m f/2.7 reflector + 2048x2048 CCD
 
 COD 247
-OBS Observer K. Yoshimoto
-COM Default details extracted from MPEC 2021-B143
-TEL 0.20-m f/8.0 Ritchey-Chretien + CCD + f/5.4 focal reducer
+OBS Observer N. Tirawat
+COM Default details extracted from MPEC 2024-A150
+TEL 0.20-m f/4.0 reflector + CCD
+
+COD 249 A
+TEL 0.19-m f/? coronagraph C2
+
+COD 249 B
+TEL 0.096-m f/? coronagraph C3
 
 COD 260
 OBS Measurer R. Matson
 COM Default details extracted from MPEC 2020-W129
 TEL 1.2-m Schmidt
 
+COD 261
+MEA E. Colombini
+COM Default details extracted from MPEC 2024-E157
+TEL 1.2-m Schmidt
+
 COD 266
 OBS S. B. Porter, S. Sheppard.
 COM Default details extracted from MPEC 2017-M31
@@ -292,11 +350,8 @@ MEA S. B. Porter
 TEL 8.2-m f/2.2 Subaru reflector
 
 COD 274
-MEA M. Micheli, M. S. Kelley, D. Farnocchia
-OBS M. S. Kelley, D. Farnocchia, A. McKay, M. Micheli, C. Opitom
-OBS S. Protopapa, C. Snodgrass
 COM Default details extracted from MPEC 2022-S20
-TEL 6.5-m reflector + CMO
+TEL 6.5-m f/20 reflector + CMO
 
 COD 290
 COM Default details extracted from MPEC 2022-T132
@@ -517,6 +572,12 @@ OBS A. Baransky, A. Khorolskiy
 COM Default details extracted from MPEC 2021-A190
 TEL 0.7-m f/4 reflector + CCD
 
+COD 586
+MEA F. Colas
+OBS F. Colas, A. Klotz, A. Duchene, P. Stammler
+COM Default details extracted from MPEC 2023-A66
+TEL 1.06-m f/17 Cassegrain + CCD
+
 COD 587
 MEA P. Sicoli
 OBS E. Colzani, E. Valli
@@ -559,12 +620,17 @@ COM Find_Orb default details
 OBS S. Sanchez, R. Stoss, J. Nomen
 TEL 0.30-m f/9 Schmidt-Cassegrain + CCD
 
+COD 637
+OBS D. Husar
+COM Default details extracted from MPEC 2023-J29
+TEL 0.12-m f/6.9 refractor + CCD
+
 COD 644
 OBS E. F. Helin, S. Pravdo, K. Lawrence, K. Kuluhiwa
 OBS M. Hicks, R. Thicksten
 MEA R. Matson
 COM Default details extracted from MPEC 2020-W21
-TEL 1.2-m Schmidt + CCD
+TEL 1.2-m f/2.5 Schmidt + CCD
 
 COD 645
 COM Find_Orb default details
@@ -658,18 +724,13 @@ COM Find_Orb default details
 OBS M. E. Van Ness
 TEL 0.59-m LONEOS Schmidt + CCD
 
-   MPECs with data for CSS sites (703),  (E12),  (I52),  (G96),  and (V06)
-   list everybody who worked at CSS at the time in question.  Properly speaking,
-   we should list one "observer" (person actually at the scope) and everybody
-   else as "measurers",  but we don't really know who that one person was.
+   See below for info on observers.  This is just telescope data.
 COD 703
 COM Find_Orb default details
-COM Valid: 2003 jan 1 - 2100
-TEL 0.68 m Schmidt
 COM Valid: 2003 jan 1 - 2016 Dec 02
-TEL  + 4K CCD
+TEL 0.68 m Schmidt + 4K CCD
 COM Valid: 2016 Dec 02 - 2100
-TEL  + 10K CCD
+TEL 0.68 m Schmidt + 10K CCD
 
 COD 704
 COM Find_Orb default details
@@ -712,7 +773,7 @@ OBS G. Hug
 MEA G. Hug
 NET USNO-SA2.0
 COM Valid: 1900 - 2010
-TEL .3 meter s-c + CCD
+TEL 0.3-m Schmidt-Cassegrain + CCD
 COM Valid: 2010 - 2100
 TEL 0.69-m reflector + CCD
 
@@ -723,7 +784,7 @@ OBS A. Cruz, L. Casady, J. Dellinger, W. G. Dillon, T. Hiserodt
 MEA J. Dellinger, W. G. Dillon
 NET GSC-ACT
 BND R
-TEL 0.46m f/4.5 Newtonian + CCD
+TEL 0.46-m f/4.5 Newtonian + CCD
 
 COD 750
 OBS N. Moritz
@@ -796,11 +857,22 @@ COM Default details extracted from MPEC 2021-B143
 TEL 0.16-m refractor + CCD
 TEL 0.51-m Schmidt-Cassegrain + CCD
 
+COD 859
+OBS C. Jacques
+COM Default details extracted from MPEC 2023-K196
+TEL 0.45-m f/2.9 reflector + CMO
+
 COD 867
 OBS T. Oribe
 COM Default details extracted from MPEC 2021-F20
 TEL 1.03-m f/4.6 reflector + CCD
 
+COD 874
+OBS E. Martiolli, F. Falkenberg, F. Monteiro, L. Fraga, F. Rodrigues, E. Martioli
+MEA F. Monteiro
+COM Default details extracted from MPEC 2025-O40
+TEL 1.60-m f/10.0 Ritchey-Chretien + CCD
+
 COD 900
 OBS Y. Ikari
 COM Default details extracted from MPEC 2021-A190
@@ -822,6 +894,10 @@ TEL 0.41-m f/3.75 astrograph + CCD
 NET UCAC-3
 ACK Batch 160511b.txt (926) - NEOCP follow-up
 
+COD 932
+OBS M. Robson
+TEL 0.4-m f/7.5 Schmidt-Cassegrain + CCD
+
 COD 938
 COM Find_Orb default details
 OBS R. Goncalves
@@ -910,6 +986,11 @@ COM Find_Orb default details
 OBS H. Denzau
 TEL 0.36-m Schmidt-Cassegrain f/5.5 + CCD
 
+COD A41
+OBS R. Palcic
+COM Default details extracted from MPEC 2024-J304
+TEL 0.60-m f/5.2 reflector + CMO
+
 COD A44
 OBS W. Ries
 COM Default details extracted from MPEC 2020-S38
@@ -1030,6 +1111,11 @@ OBS J. Linder
 COM Default details extracted from MPEC 2021-A190
 TEL 0.20-m f/5.8 Schmidt-Cassegrain + CCD
 
+COD B53
+OBS D. Pivato
+COM Default details extracted from MPEC 2024-G193
+TEL 0.25-m  f/5.0 reflector + CCD
+
 COD B54
 OBS J. Bel
 COM Default details extracted from MPEC 2021-N06
@@ -1075,6 +1161,12 @@ OBS M. Martignoni
 COM Default details extracted from MPEC 2021-A190
 TEL 0.25-m f/10 Schmidt-Cassegrain + CCD
 
+COD B83
+OBS T. Noel
+COM Default details extracted from MPEC 2023-C137
+TEL 0.05-m f/5.3 refractor + CMOS
+TEL 0.6-m f/7.6 refractor + CMOS + CCD
+
 COD B92
 OBS M. Audejean
 COM Default details extracted from MPEC 2021-N06
@@ -1144,6 +1236,18 @@ OBS G. Dangl
 COM Default details extracted from MPEC 2021-A190
 TEL 0.25-m f/4.8 reflector + CCD
 
+COD C49 G
+TEL 0.16-m f/? coronagraph HI1-A
+
+COD C49 H
+TEL 0.34-m f/? coronagraph COR2-A
+
+COD C50 O
+TEL 0.16-m f/? coronagraph HI1-B
+
+COD C50 P
+TEL 0.34-m f/? coronagraph COR2-B
+
 COD C51
 COM Find_Orb default details
 MEA A. Mainzer, E. Wright, J. Bauer, T. Grav, J. Dailey
@@ -1173,6 +1277,12 @@ OBS O. Tercu, D. Manole, C. Fotin, C. Antohi, F. Jiglau, A. Serbanescu
 COM Default details extracted from MPEC 2022-L66
 TEL 0.4-m f/8 Ritchey-Chretien + CCD
 
+COD C75
+MEA V. Gonano, T. Gregor
+OBS T. Gregor
+COM Default details extracted from MPEC 2024-D126
+TEL 0.25-m f/5.7 Schmidt-Cassegrain + CCD
+
 COD C77
 OBS A. Mantero
 COM Default details extracted from MPEC 2021-E131
@@ -1193,11 +1303,23 @@ OBS L. Tremosa
 COM Default details extracted from MPEC 2021-A190
 TEL 0.30-m f/5 reflector + CCD
 
+COD C94
+OBS Y. Kechin, V. Lipunov, E. Gorbovskoy, N. Tiurina, P. Balanutsa
+OBS V. Kornilov, A. Kuznetsov, O. Gress, D. Zimnukhov, S. Yazev, N. Budnev
+COM Default details extracted from MPEC 2024-C09
+TEL 0.4-m f/2.5 reflector   CCD.
+
 COD C95
 COM Find_Orb default details
-OBS J. Jahn
+OBS D. Husar, J. Jahn, K. Meo, W. Pasche
+MEA D. Husar, J. Jahn
 TEL 0.60-m f/3.2 Newtonian reflector + CCD
 
+COD C97
+OBS S. Al-Alawi, Y. Al-Majrafi, M. Al- Hadi, M. Al-tobi
+COM Default details extracted from MPEC 2022-Y104
+TEL 0.61-m f/7.84 Ritchey-Chretien + CCD
+
 COD D00
 OBS V. Nevski
 COM Default details extracted from MPEC 2021-A190
@@ -1207,6 +1329,12 @@ COD D03
 COM Default details from http://www.6roads.com.pl/
 TEL 0.40-m f/3.8 Newtonian + CCD
 
+COD D04
+MEA A. Ivanov
+OBS A. Ivanov, V. Ivanov, N. Ivanova, M. Archibasov
+COM Default details extracted from MPEC 2025-E162
+TEL 0.279-m f/2.2 reflector + CCD
+
 COD D15
 OBS T. Lehmann
 COM Default details extracted from MPEC 2022-G109
@@ -1218,18 +1346,104 @@ OBS T. Santana-Ros, B. Gendre
 MEA M. Micheli
 TEL 1.0-m reflector + CCD
 
+COD D23
+MEA J. M. Perez-Redondo
+OBS J. M. Perez-Redondo, D. Rodriguez
+COM Default details extracted from MPEC 2024-L77
+TEL 0.20-m f/10.0 sc + CCD
+
+COD D28
+OBS J. Solaz
+COM Default details extracted from MPEC 2024-A150
+TEL 0.35-m f/4.2 reflector + CMO
+
 COD D29
 COM Find_Orb default details
 OBS H. B. Zhao, B. Li, G. Zhaori, R. Q. Hong, L. F. Hu
 MEA H. B. Zhao, B. Li. H. Lu, G. Zhaori
 TEL 1.04-m f/1.8 Schmidt + CCD
 
+COD D30
+OBS D. Scharnhorst
+COM Default details extracted from MPEC 2024-E49
+TEL 0.15-m f/6.2 reflector + CCD
+
+COD D31
+OBS M. Stefanini
+COM Default details extracted from MPEC 2024-F83
+TEL 0.36-m f/6.6 Schmidt-Cassegrain + CMO
+
 COD D35
 OBS C.-S. Lin, Z.-Y. Lin
 COM Default details extracted from MPEC 2021-L04
 MEA Z.-Y. Lin
 TEL 0.4-m f/8.4 Ritchey-Chretien + CCD
 
+COD D38
+OBS A. Pearce
+COM Default details extracted from MPEC 2024-L77
+TEL 0.23-m f/4 Reflector + CCD
+TEL 0.30-m f/5.5 Reflector + CCD
+TEL 0.30-m f/5.5 reflector + CCD
+
+COD D40
+OBS D. Pica
+COM Default details extracted from MPEC 2024-H91
+TEL 0.23-m f/6 Schmidt-Cassegrain + CMO
+
+COD D43
+OBS V. della Vecchia
+COM Default details extracted from MPEC 2024-C58
+TEL 0.25-m f/5.6 Ritchey-Chretien + CMO
+
+COD D47
+OBS D. Pivato
+COM Default details extracted from MPEC 2024-L77
+TEL 0.25-m f/5.0 Baker Ritchey Chretien + CCD
+
+COD D48
+OBS W. Wiedemann
+COM Default details extracted from MPEC 2024-M118
+TEL 0.28-m f/4.3 Schmidt- Cassegrain + CCD
+
+COD D49
+OBS J. Camarasa
+COM Default details extracted from MPEC 2024-N80
+TEL 0.07-m f/5.8 refractor + CCD
+
+COD D54
+OBS Y. Kechin, V. Lipunov, E. Gorbovskoy, N. Tiurina, P. Balanutsa
+OBS V. Kornilov, A. Kuznetsov, D. Zimnukhov, O. Gress, A. Tlatov, V. Senik
+OBS D. Dormidontov, A. Parkhomenko
+COM Default details extracted from MPEC 2024-D126
+TEL 0.4-m f/2.5 reflector + CCD
+
+COD D56
+OBS M. Zancan
+COM Default details extracted from MPEC 2025-D13
+TEL 0.27-m f/6.3 Reflector + CMO
+
+COD D63
+OBS R. Bacci
+COM Default details extracted from MPEC 2024-V93
+TEL 0.41-m f/3.75 reflector + CCD
+
+COD D64
+OBS M. F. Caramanico
+COM Default details extracted from MPEC 2024-H91
+TEL 0.25-m f/4.0 0.25m Newton + CMOS + CMO
+
+COD D65
+OBS M. Pegoraro
+COM Default details extracted from MPEC 2025-D255
+MEA M. Zancan
+TEL 0.36-m f/7 reflector + CMO
+
+COD D66
+OBS F. Palaia
+COM Default details extracted from MPEC 2025-G43
+TEL 0.40-m f/10 reflector + CCD
+
 COD D78
 OBS T. Tanaka
 COM Default details extracted from MPEC 2021-O47
@@ -1262,11 +1476,26 @@ OBS A. Hidas
 COM Default details extracted from MPEC 2021-C16
 TEL 0.35-m f/1.9 reflector + CCD
 
+COD E29
+OBS A. Pearce
+COM Default details extracted from MPEC 2025-P113
+TEL 1.00-m f/6.0 reflector + CCD
+
+COD E62
+OBS B. Lutkenhoner, E. Cortes
+COM Default details extracted from MPEC 2024-T138
+TEL 0.5-m f/6.8 Corrected Dall-Kirkham + CCD
+
 COD E85
 OBS J. McCormick
 COM Default details extracted from MPEC 2021-F20
 TEL 0.35-m f/10 Schmidt-Cassegrain + CCD
 
+COD E86
+OBS S. Badcock
+COM Default details extracted from MPEC 2025-G81
+TEL 0.25-m f/4.0 reflector + CMO
+
 COD E89
 OBS R. Carstens
 COM Default details extracted from MPEC 2021-A190
@@ -1277,22 +1506,6 @@ OBS J. Drummond
 COM Default details extracted from MPEC 2021-C16
 TEL 0.41-m f/4.5 Newtonian reflector + CCD
 
-COD F51
-MEA K. Chambers, S. Chastel, T. de Boer, L. Denneau, J. Fairlamb
-MEA H. Flewelling, M. Huber, C.-C. Lin, E. Magnier, Y. Ramanjooloo
-MEA R. Wainscoat, R. Weryk
-OBS J. Bulger, T. Lowe, A. Schultz, M. Willman
-COM Default details extracted from MPEC 2021-C313
-TEL 1.8-m Ritchey-Chretien + CCD
-
-COD F52
-MEA K. Chambers, S. Chastel, T. de Boer, L. Denneau, J. Fairlamb
-MEA H. Flewelling, M. Huber, C.-C. Lin, E. Magnier, Y. Ramanjooloo
-MEA R. Wainscoat, R. Weryk
-OBS J. Bulger, T. Dukes, T. Lowe, A. Schultz, M. Willman
-COM Default details extracted from MPEC 2021-C318
-TEL 1.8-m Ritchey-Chretien + CCD
-
 COD F65
 MEA M. Wawerzonnek
 OBS P. Breitenstein
@@ -1361,6 +1574,11 @@ OBS A. Valvasori, E. Guido
 COM Default details extracted from MPEC 2021-J28
 TEL 0.23-m f/5.2 reflector + CCD
 
+COD G19
+OBS I. Kuettner
+COM Default details extracted from MPEC 2022-W132
+TEL 0.23-m f/5.5 reflector + CCD
+
 COD G20
 OBS Y. Degot Longhi
 COM Default details extracted from MPEC 2021-B143
@@ -1441,12 +1659,10 @@ TEL 0.8-m f/7.0 reflector + CMOS
 
 COD G96
 COM Find_Orb default details
-COM Valid: 2003 jan 1 - 2100
-TEL 1.5-m reflector
 COM Valid: 2003 jan 1 - 2016 May 26
-TEL  + 4K CCD
+TEL 1.5-m reflector + 4K CCD
 COM Valid: 2016 May 26 - 2100
-TEL  + 10K CCD
+TEL 1.5-m reflector + 10K CCD
 
 COD H01
 COM Find_Orb default details
@@ -1572,6 +1788,12 @@ COD I33
 COM Find_Orb default details
 TEL 4.1-m reflector + CCD
 
+COD I40
+MEA M. Ferrais
+OBS E. Jehin, M. Ferrais
+COM Default details extracted from MPEC 2025-N22
+TEL 0.60-m f/8.0 reflector Ritchey-Chretien + CCD
+
 COD I41
 MEA B. T. Bolin, Z.-Y. Lin, F. J. Masci
 OBS B. T. Bolin, Z. T. F. Collaboration
@@ -1691,6 +1913,11 @@ OBS F. Gomez
 COM Default details extracted from MPEC 2021-L04
 TEL 0.25-m f/10 Schmidt-Cassegrain + CCD.
 
+COD J37
+OBS F. J. Alvarez
+COM Default details extracted from MPEC 2023-A50
+TEL 0.15-m f/5.0 Newtonian reflector + CCD
+
 COD J38
 OBS F. Garcia
 COM Default details extracted from MPEC 2021-B143
@@ -1711,6 +1938,11 @@ OBS G. Muler
 COM Default details extracted from MPEC 2021-L04
 TEL 0.30-m f/6 reflector + CCD
 
+COD J51
+OBS J. Henriquez
+COM Default details extracted from MPEC 2025-M120
+TEL 0.2-m f/9.0 Cassegrain + CMO
+
 COD J57
 OBS A. Fornas
 COM Default details extracted from MPEC 2021-J104
@@ -1801,6 +2033,16 @@ OBS L. Grimm
 COM Default details extracted from MPEC 2020-G44
 TEL 0.25-m f/4.8 Newtonian reflector + CCD
 
+COD K32
+OBS G. Locatelli
+COM Default details extracted from MPEC 2022-Y114
+TEL 0.25-m f/6.3 0.25 m. f/6.3 Schmidt-Cassegrain + CCD
+
+COD K35
+OBS P. Remmel
+COM Default details extracted from MPEC 2023-L10
+TEL 0.36-m f/1.9 reflector + CMO
+
 COD K38
 OBS G. Baj
 COM Default details extracted from MPEC 2021-B143
@@ -1852,6 +2094,11 @@ OBS R. Bacci
 COM Default details extracted from MPEC 2021-E118
 TEL 0.41-m f/3.2 Newtonian reflector + CCD
 
+COD K70
+OBS A. Brosio
+COM Default details extracted from MPEC 2023-E49
+TEL 0.30-m f/4.0 reflector + CCD + CCD
+
 COD K73
 OBS F. Taccogna
 COM Default details extracted from MPEC 2020-W26
@@ -1939,6 +2186,11 @@ OBS A. Brosio, A. De Pieri
 COM Default details extracted from MPEC 2020-K194
 TEL 0.5-m f/8.0 Ritchey-Chretien + CCD
 
+COD K97
+OBS P. Ditz
+COM Default details extracted from MPEC 2024-N80
+TEL 0.54-m f/3.75 reflector + CCD
+
 COD K98
 COM Default details from http://www.6roads.com.pl/
 TEL 0.40-m f/3.8 Newtonian + CCD
@@ -1949,9 +2201,9 @@ OBS V. Kudak, V. Perig
 TEL 0.40-m telescope + CCD
 
 COD L01
-MEA D. Pujagic, K. Korlevic
-OBS K. Korlevic, D. Pujagic, V. Dobos
-COM Default details extracted from MPEC 2021-C313
+COM Default details 2025 Oct 03 from L. Poropat
+OBS K. Korlevic, L. Poropat
+MEA K. Korlevic
 TEL 1.0-m f/2.9 reflector + CCD
 
 COD L02
@@ -1961,9 +2213,16 @@ TEL 0.25-m f/4.7 reflector + CCD
 
 COD L04
 OBS L. Hudin
-COM Default details extracted from MPEC 2021-A190
-TEL 0.3-m f/5 reflector + CCD
+COM From personal communication
+COM Valid: 1900 dec 1 - 2012 apr 1
 TEL 0.1-m f/9 refractor + CCD
+COM Valid: 2012 apr 1 - 2100 dec 1
+TEL 0.3-m f/5 reflector + CCD
+
+COD L05
+OBS C. Ghidetti
+COM Default details extracted from MPEC 2024-J122
+TEL 0.25-m f/0.2 Newtonian reflector + CCD
 
 COD L06
 MEA G. Ventre, P. Sicoli
@@ -2014,6 +2273,11 @@ OBS G. Lehmann
 COM Default details extracted from MPEC 2019-P11
 TEL 0.4-m f/3.6 reflector + CCD
 
+COD L30
+OBS T. Zilch
+COM Default details extracted from MPEC 2023-B57
+TEL 0.3-m f/4 reflector + CCD
+
 COD L32
 OBS Y. JeongAhn
 COM Default details extracted from MPEC 2019-Y97
@@ -2034,6 +2298,11 @@ OBS M. Lehky
 COM Default details extracted from MPEC 2020-C98
 TEL 0.60-m f/5 reflector +  CCD
 
+COD L38
+OBS A. Opitz
+COM Default details extracted from MPEC 2023-L60
+TEL 0.35-m f/4.6 Newton + CCD
+
 COD L39
 OBS M. Bertini, L. Franchini
 COM Default details extracted from MPEC 2021-C321
@@ -2064,6 +2333,11 @@ OBS G. Borisov
 COM Default details extracted from MPEC 2017-E42
 TEL 0.4-m f/2.3 astrograph + CCD
 
+COD L53
+OBS D. Agnetti
+COM Default details extracted from MPEC 2022-Y232
+TEL 0.28-m f7.7 S-C + CCD
+
 COD L54
 MEA A. Sonka
 OBS A. Sonka, A. Nedelcu
@@ -2086,6 +2360,11 @@ OBS M. Iozzi
 COM Default details extracted from MPEC 2021-A190
 TEL 0.2-m f/7.4 Schmidt-Cassegrain + CCD
 
+COD L65
+OBS H. Duin
+COM Default details extracted from MPEC 2023-J95
+TEL 0.23-m f/6.3 reflector + CMO
+
 COD L68
 OBS S. L. Ferreira
 COM Default details extracted from MPEC 2022-H122
@@ -2101,6 +2380,11 @@ OBS E. Romas
 COM Default details extracted from MPEC 2021-F20
 TEL 0.2-m f/5 reflector + CCD
 
+COD L79
+OBS A. Nagy Melykuti
+COM Default details extracted from MPEC 2024-D126
+TEL 0.20-m f/4.0 reflector + CCD
+
 COD L80
 CON M. Micheli
 COM Default details from private communication, 2020 Jun 04
@@ -2126,16 +2410,42 @@ OBS G. Duszanowicz
 COM Default details extracted from MPEC 2021-W31
 TEL 0.36-m f/7.7 reflector + CCD
 
+COD L90
+OBS A. Brosio
+COM Default details extracted from MPEC 2023-V147
+TEL 0.30-m f/4.0 reflector + CCD
+
 COD L92
 OBS T. Scarmato
 COM Default details extracted from MPEC 2021-J28
 TEL 0.25-m Newtonian reflector + CCD
 
+COD L99
+OBS A. M. Kozhukhov
+COM Default details extracted from MPEC 2023-S189
+TEL 0.30-m f/1.0 astrograph + CMO
+
+COD M01
+MEA L. Pipeline, E. Ofek
+OBS L. Auto
+COM Default details extracted from MPEC 2025-N64
+TEL 0.28-m Rowe-Ackerman Schmidt + CCD
+
 COD M03
 OBS C. Grabenbauer
 COM Default details extracted from MPEC 2022-G109
 TEL 0.15-m f/4 refractor + CCD
 
+COD M04
+OBS J. M. Llenas garcia
+COM Default details extracted from MPEC 2023-C45
+TEL 0.51-m f/6.8 CDK + CCD
+
+COD M06
+OBS J. M. Perez-Redondo
+COM Default details extracted from MPEC 2024-F34
+TEL 0.20-m f/10.0 SC + CCD
+
 COD M09
 OBS P.-J. Dekelver
 COM Default details extracted from MPEC 2022-F14
@@ -2151,6 +2461,16 @@ OBS G. Attard
 COM Default details extracted from MPEC 2022-G14
 TEL 0.28-m f/2.2 reflector + CCD
 
+COD M13
+OBS P. Buttani
+COM Default details extracted from MPEC 2023-N01
+TEL 0.20-m f/3.2 reflector + CMO
+
+COD M14
+OBS M. Auteri
+COM Default details extracted from MPEC 2023-J29
+TEL 0.20-m f/5 Newtonian reflector + CCD
+
 COD M16
 OBS S. Negri
 COM Default details extracted from MPEC 2022-F14
@@ -2166,18 +2486,21 @@ OBS S. Fritsche
 COM Default details extracted from MPEC 2022-C56
 TEL 0.10-m f/5.8 refractor
 
+COD M19
+OBS Z. Orbanic
+COM Default details extracted from MPEC 2024-J304
+TEL 0.25-m f/3.8 reflector + CCD
+
 COD M21
 MEA L. Buzzi
 OBS A. Aletti, F. Bellini, L. Buzzi, G. Galli
 COM Default details extracted from MPEC 2022-H30
 TEL 0.36-m f/8.4 reflector + CCD
 
-COD M22
-MEA L. Denneau, N. Erasmus, A. Fitzsimmons, A. Lawrence, J. Robinson
-MEA R. Siverd, J. Tonry, H. Weiland
-OBS L. Denneau, R. Siverd, J. Tonry, H. Weiland
-COM Default details extracted from MPEC 2022-C56
-TEL 0.5-m reflector + CCD
+COD M24
+OBS B. Monteleone
+COM Default details extracted from MPEC 2024-J304
+TEL 0.25-m f/8.0 reflector + CMO
 
 COD M26
 MEA M. Lombardo
@@ -2190,20 +2513,110 @@ OBS N. Erasmus
 COM Default details extracted from MPEC 2022-O04
 TEL 1.0-m f/8 Reflector + CCD
 
+COD M29
+OBS V. Tinella, A. De Pieri
+COM Default details extracted from MPEC 2023-V111
+TEL 0.40-m f/8 Reflector + CCD
+
 COD M32
 OBS O. Briukhovetskyi
 COM Default details extracted from MPEC 2022-O04
 TEL 0.35-m f/2.0 reflector + CCD
 
+COD M35
+MEA R. Anghel, A. Anghel
+OBS R. Anghel
+COM Default details extracted from MPEC 2023-N01
+TEL 0.2-m f/12 Cassegrain + CCD
+
+COD M38
+OBS T. Elek
+COM Default details extracted from MPEC 2023-M109
+TEL 0.20-m f/4 reflector + CCD
+
+COD M40
+MEA A. M. Abdelaziz
+OBS A. M. Abdelaziz, S. K. Tealib
+COM Default details extracted from MPEC 2023-B154
+TEL 0.36-m f/2.2 reflector + CCD
+
 COD M43
 OBS A. Gabuya
 COM Default details extracted from MPEC 2020-W26
 TEL 0.41-m f/8 Schmidt-Cassegrain + CCD
 
-COM O85
-OBS Y. Yu, K. Tang, A. Pomazan
-COM Default details extracted from MPEC 2020-J29
-TEL 0.50-m f/7.0 Cassegrain + CCD
+COD M44
+OBS M. Odeh
+COM Default details extracted from MPEC 2025-N35
+TEL 0.36-m f/7.7 SC + CMO
+
+COD M45
+OBS F. Ursache
+COM Default details extracted from MPEC 2023-J95
+TEL 0.41-m f/7.5 reflector + CMO
+
+COD M44
+OBS M. Odeh
+MEA M. Odeh, S. Ashi
+COM Default details extracted from MPEC 2023-X175
+TEL 0.36-m f/7.7 Schmidt-Cassegrain + CMO
+
+COD M45
+OBS F. Ursache
+COM Default details extracted from MPEC 2025-E162
+TEL 0.41-m f/7.5 reflector + CMO
+
+COD M47
+OBS M. F. Talafha
+COM Default details extracted from MPEC 2025-G102
+TEL 0.43-m f/6.8 reflector + CCD
+
+COD M49
+MEA D. Husar
+OBS D. Husar, M. Junius
+COM Default details extracted from MPEC 2023-M112
+TEL 0.25-m f/4.6 reflector + CCD
+
+COD M50
+OBS G. Masi
+COM Default details extracted from MPEC 2023-M28
+TEL 0.36-m f/7.2 Schmidt-Cassegrain + CCD
+
+COD M52
+OBS M. Dionisi
+COM Default details extracted from MPEC 2023-J95
+TEL 0.25-m f/5 reflector + CMOS + CCD
+
+COD M54
+MEA J.-M. Mari
+OBS J.-M. Mari, C. Jasicki
+COM Default details extracted from MPEC 2024-K130
+TEL 0.25-m f/4.5 reflector + CMO
+
+COD M57
+OBS A. Nastasi
+COM Default details extracted from MPEC 2023-W12
+TEL 1.00-m f/2.1 reflector + CCD
+
+COD M60
+OBS A. Carbognani
+COM Default details extracted from MPEC 2023-X143
+TEL 0.3-m f/4.0 reflector + CCD
+
+COD M63
+OBS D. Licchelli
+COM Default details extracted from MPEC 2024-A53
+TEL 0.3-m f/5.3 reflector + CCD
+
+COD M64
+OBS K. Johnson
+COM Default details extracted from MPEC 2024-E157
+TEL 0.25-m f/6.8 SCT + CCD
+
+COD M75
+OBS A. V. Skachedub
+COM Default details extracted from MPEC 2024-Q29
+TEL 0.28-m f/2.2 reflector + CMO
 
 COD N42
 COM Default details from private communication
@@ -2222,6 +2635,12 @@ OBS S. Barway
 COM Default details extracted from MPEC 2020-W177
 TEL 0.70-m f/6.5 Corrected Dall-Kirkham + CCD
 
+COD N54
+OBS Z. J. Xu, B. Li, J. Tian, Y. J. Liu, H. B. Zhao, C. Zhang, T. Chen
+COM Default details extracted from MPEC 2025-D137
+MEA Z. J. Xu, B. Li, J. Tian, Y. J. Liu, H. B. Zhao
+TEL 0.7-m f/10 Ritchey-Chretien + CCD
+
 COD N55
 OBS T. Chen, D. W. E. Green
 MEA T. Chen
@@ -2244,23 +2663,100 @@ OBS Observers X. Gao, Q.-Z. Ye
 MEA Q.-Z. Ye
 TEL 0.28-m f/2.2 Schmidt.
 
+COD N87
+MEA M. Zhang, X. Liao, Z. Yang
+OBS M. Zhang, G. Sun, X. Gao, H. B. Niu, G. J. Feng
+COM Default details extracted from MPEC 2023-K53
+TEL 1.0-m f/2.2 reflector + CCD
+
 COD N88
 MEA Q.-Z. Ye
 OBS X. Gao
 COM Default details extracted from MPEC 2021-C96
 TEL 0.6-m f/8 Ritchey-Chretien + CCD
 
+COD N89
+MEA M. Zhang
+OBS M. Zhang, X. Gao
+COM Default details extracted from MPEC 2023-H131
+TEL 0.50-m f/4 reflector + CCD
+
+COD N94
+OBS X. Liao, D. Xu, X. Gao, M. Zhang, S.-Q. Jiang, X. Liu, J. An
+OBS W.-J. Zhou, Z.-S. Yang, G.-Y. Sun
+MEA X. Liao, M. Zhang, W.-J. Zhou, Z.-S. Yang, G.-Y. Sun
+COM Default details extracted from MPEC 2025-L36
+TEL 1.00-m f/2.5 reflector + CMO
+
+COD O17
+OBS Y. T. Zhu
+COM Default details extracted from MPEC 2025-N64
+TEL 0.71-m f/1.7 prime-focus corrector + CMOS
+
+COD O18
+MEA B. Li, H. B. Zhao, Z. J. Xu, G. T. Zhaori
+OBS K. Yan, Z. Q. Li, J. Z. Zhu, N. Jiang, Z. Y. Liu
+COM Default details extracted from MPEC 2023-X77
+TEL 2.5-m f/2.48 reflector + CCD
+
+COD O40
+OBS C. Guo
+COM Default details extracted from MPEC 2025-G102
+TEL 0.36-m f/2.2 reflector + CMO
+
+COD O46
+OBS Z. Wang
+TEL 0.25-m f/8 reflector + CMO
+
 COD O49
 OBS F. Li, Y. Yuan, J. Chen, A. Zhu, Y. Fu
 MEA B. Li, H. B. Zhao
 TEL 0.8-m f/10 Ritchey-Chretien + 2048 CCD
 
+COD O51
+OBS T. Thaluang
+COM Default details extracted from MPEC 2022-Y232
+TEL 0.2-m f/4 reflector + CCD
+
+COD O52
+OBS N. Tirawat
+COM Default details extracted from MPEC 2024-D126
+TEL 0.20-m f/4 reflector + CCD
+
+COD O53
+OBS W. Jaichalad
+COM Default details extracted from MPEC 2024-D126
+TEL 0.23-m f/2.2 SCT + CMO
+
 COD O75
 COM Find_Orb default details
 OBS T. Namkhai, S. Schmalz
 MEA S. Schmalz
 TEL 0.4-m f/2.3 reflector + CCD
 
+COD O85
+OBS Y. Yu, K. Tang, A. Pomazan
+COM Default details extracted from MPEC 2023-Y02
+TEL 0.50-m f/7.0 Cassegrain + CCD
+
+COD P07
+MEA M. Cornell, M. Kotson, R. Rios, J. Ruprecht, J. Vaillancourt, J. Varey
+MEA H. Viggh, D. Woods
+OBS M. Blythe, R. Brungard, P. Festler, T. McVey, J. Paige, G. Spitz
+OBS L. Banks
+COM Default details extracted from MPEC 2022-Y15
+TEL 3.5-m f/1.0 reflector + CCD
+
+COD P13
+OBS Z. Wang, B. Liu
+MEA Z. Wang
+TEL 0.28-m f/2.2 reflector + CMO
+
+COD P14
+OBS A. Pearce
+COM Default details extracted from MPEC 2024-N80
+TEL 0.05-m f/5 Apochromatic Refractor + CCD
+
 COD P18
 OBS S. Zhang, H. Chen, X. Yin
 COM Default details extracted from MPEC 2021-F20
@@ -2281,6 +2777,16 @@ OBS Y. Yamaguchi
 COM Default details extracted from MPEC 2021-N06
 TEL 0.08-m f/5.5 refractor
 
+COD Q06
+OBS H. Watanabe
+COM Default details extracted from MPEC 2024-C158
+TEL 0.35-m f/1.9 Schmidt-Cassegrain + CMO
+
+COD Q10
+OBS M. Ishiguro
+COM Default details extracted from MPEC 2024-W185
+TEL 0.20-m f/5 reflector + CCD
+
 COD Q11
 MEA H. Sato
 OBS T. Ikemura
@@ -2294,11 +2800,26 @@ OBS L. Conversi, M. Micheli
 COM Default details extracted from MPEC 2022-L04
 TEL 0.28-m f/2.2 reflector + CMO
 
+COD Q19
+OBS K. Sugawara
+COM Default details extracted from MPEC 2024-D126
+TEL 0.2-m f/4.0 BKP200/800OTA + CCD
+
+COD Q20
+OBS J. Jahn
+COM Default details extracted from MPEC 2024-G15
+TEL 0.30-m f/3.8 reflector + CMO
+
 COD Q21
 OBS H. Nohara
 COM Default details extracted from MPEC 2021-B143
 TEL 0.4-m f/3.8 astrograph + CCD
 
+COD Q22
+OBS E. Guido, M. Rocchetto, J. Ferguson
+COM Default details extracted from MPEC 2025-N12
+TEL 0.35-m f/3.0 reflector + CMO
+
 COD Q23
 OBS H. Sato
 COM Default details extracted from MPEC 2021-B143
@@ -2319,6 +2840,11 @@ OBS M. Petkovic, T. Preston, P. Tisserand, P. Oates, C. Vest, G. Bloxham
 COM Default details extracted from MPEC 2022-L66
 TEL 1.35-m Cassegrain + CCD
 
+COD Q56
+OBS P.-J. Dekelver
+COM Default details extracted from MPEC 2024-L140
+TEL 0.14-m f/4.8 refractor + CMO
+
 COD Q57
 COM Find_Orb default details
 OBS Y. JeongAhn
@@ -2400,11 +2926,38 @@ COD Q70
 OBS S. Kerr
 COM Default details extracted from MPEC 2021-G09
 
+COD Q73
+OBS M. Murray
+COM Default details extracted from MPEC 2025-N64
+TEL 0.30-m f/4.0 reflector + CMO
+
 COD Q80
 COM Find_Orb default details
 OBS T. Lovejoy
 TEL 0.20-m f/2.1 Schmidt-Cassegrain + CCD
 
+COD R14
+OBS V. Perez
+COM Default details extracted from MPEC 2025-M120
+TEL 0.25-m f/4.72 reflector + CMO
+
+COD R17
+MEA L. Denneau, N. Erasmus, A. Fitzsimmons, J. Robinson, R. Siverd
+MEA J. Tonry, H. Weiland, J. Licandro, M. Alarcon
+OBS L. Denneau, R. Siverd, J. Tonry, H. Weiland, J. Licandro, M. Alarcon
+COM Default details extracted from MPEC 2025-M120
+TEL 0.56-m f/2.2 Astrograph + CMOS
+
+COD R45
+OBS R. Castillo
+COM Default details extracted from MPEC 2025-N35
+TEL 0.10-m f/5.5 refractor + CMO
+
+COD R56
+COM Default details extracted from MPEC 2023-U76
+OBS A. Vilquin Barrajon
+TEL 0.20-m f/8.1 reflector + CCD
+
 COD R57
 COM Default details extracted from MPEC 2021-F112
 OBS A. C. Gilmore, P. M. Kilmartin
@@ -2422,6 +2975,21 @@ COM Default details extracted from MPEC 2022-K07
 OBS R. B. Glassey
 TEL 0.15-m f/5.0 Newtonian + CCD
 
+COD R67
+OBS M. Audejean
+COM Default details extracted from MPEC 2025-N64
+TEL 0.40-m f/4.4 reflector + CMO
+
+COD S24
+OBS S. Gombos
+COM Default details extracted from MPEC 2025-M120
+TEL 0.15-m f/5.0 reflector + CCD
+
+COD S30
+OBS A. Forgacs
+COM Default details extracted from MPEC 2025-M120
+TEL 0.25-m f/4.0 reflector + CCD
+
 COD T03
 OBS T. Santana-Ros, M. Micheli, L. Conversi
 COM Default details extracted from MPEC 2022-G189
@@ -2434,30 +3002,6 @@ COM Default details extracted from MPEC 2021-P122
 MEA M. Micheli
 TEL 0.4-m reflector + CCD
 
-COD T05
-COM Find_Orb default details
-OBS L. Denneau, A. Heinze, H. Weiland,  J. Tonry
-MEA L. Denneau, A. Heinze, J. Tonry
-COM Valid: 2000 - 2018 May 1
-OBS B. Stalder, A. Sherstyuk
-COM Valid: 2018 May 1 - 2100
-OBS H. Flewelling, A. Fitzsimmons, D. Young
-COM Valid: 2018 Sep 1 - 2100
-OBS B. Stalder
-TEL 0.5-m f/2.0 Schmidt + CCD
-
-COD T08
-COM Find_Orb default details
-OBS L. Denneau, A. Heinze, H. Weiland,  J. Tonry
-MEA L. Denneau, A. Heinze, J. Tonry
-COM Valid: 2000 - 2018 May 1
-OBS B. Stalder, A. Sherstyuk
-COM Valid: 2018 May 1 - 2100
-OBS H. Flewelling, A. Fitzsimmons, D. Young
-COM Valid: 2018 Sep 1 - 2100
-OBS B. Stalder
-TEL 0.5-m f/2.0 Schmidt + CCD
-
 COD T09
 COM Find_Orb default details
 CON D. J. Tholen, Institute for Astronomy, 2680 Woodlawn Drive, Honolulu, HI 96822
@@ -2468,6 +3012,11 @@ NET Gaia-DR1
 COM Valid: 2018 mar 1-2100
 NET Gaia-DR2
 
+COD T11
+MEA S. Deen
+COM Default details extracted from MPEC 2024-G193
+TEL 3.8-m Cassegrain reflector
+
 COD T12
 COM Find_Orb default details
 CON D. J. Tholen, Institute for Astronomy, 2680 Woodlawn Drive, Honolulu, HI 96822
@@ -2540,6 +3089,12 @@ OBS P. Lewin
 COM Default details extracted from MPEC 2021-F115
 TEL 0.36-m reflector + CCD
 
+COD U94
+OBS T. Prystavski, J.-C. Merlin
+COM Default details extracted from MPEC 2023-J95
+TEL 0.51-m f/4.5 Corrected Dall-Kirkham + CCD
+TEL 0.51-m f/6.8 astrograph + f/4.5 focal reducer + CCD
+
 COD V00
 COM Find_Orb default details
 TEL 2.25-m reflector + 4x4K mosaic CCD
@@ -2587,6 +3142,11 @@ OBS D. Husar
 COM Default details extracted from MPEC 2022-J42
 TEL 0.4-m f/3.7 reflector + CCD
 
+COD V24
+OBS A. Helms
+COM Default details extracted from MPEC 2024-E188
+TEL 0.32-m f/6.7 reflector + CCD
+
 COD V26
 MEA A. Mokhnatkin
 OBS A. Mokhnatkin, R. Celaya
@@ -2598,12 +3158,23 @@ OBS B. K. Kendrick
 COM Default details extracted from MPEC 2022-B138
 TEL 0.25-m f/6 reflector + CCD
 
+COD V28
+OBS R. Reszelewski, M. Zolnowski, M. Gedek, K. Zukowski, P. Baginska
+MEA R. Reszelewski
+COM Default details extracted from MPEC 2024-N62
+TEL 0.28-m f/2.2 reflector + CMOS
+
 COD V37
 MEA M. Wawerzonnek
 OBS P. Breitenstein
 COM Default details extracted from MPEC 2020-Y113
 TEL 1.0-m Ritchey-Chretien + CCD
 
+COD V38
+OBS A. Hale
+COM Default details extracted from MPEC 2023-J95
+TEL 0.40-m f/10 Schmidt-Cassegrain + CCD
+
 COD V39
 MEA T. Lister
 OBS T. Lister, M. Hui, M. S. P. Kelley, J. Chatelain, E. Gomez
@@ -2616,6 +3187,16 @@ OBS J. Purcell
 COM Default details extracted from MPEC 2021-W138
 TEL 0.13-m refractor + CCD
 
+COD W05
+OBS J.-F. Gout
+COM Default details extracted from MPEC 2025-E163
+TEL 0.5-m f/1.5 reflector + CMOS
+
+COD W13
+OBS C. J. Horowitz
+COM Default details extracted from MPEC 2024-F101
+TEL 0.20-m f/2 Schmidt-Cassegrain + CMO
+
 COD W16
 OBS M. Holbrook
 COM Default details extracted from MPEC 2021-C121
@@ -2642,32 +3223,62 @@ COM Aplanatic Schmidt-Cassegrain
 COM Photo/astrometry Astrometrica 4.12.0.488
 COM (Default details from R. L. Flynn,  2019 Sep 4)
 
+COD W42
+OBS J. T. Grage
+COM Default details extracted from MPEC 2024-G74
+TEL 0.30-m f/3.3 SCT + CMO
+
 COD W46
 OBS J. Haidet
 COM Default details extracted from MPEC 2021-B143
 TEL 0.36-m f/6.3 Ritchey-Chretien + CCD
 
+COD W50
+OBS M. A. Phillips
+COM Default details extracted from MPEC 2024-L77
+TEL 0.36-m f/4.5 reflector + CCD
+
 COD W53
 OBS R. Jennings
-COM Default details extracted from MPEC 2021-N06
-TEL 0.20-m f/3.9 reflector + CCD
+COM Default details extracted from MPEC 2025-E162
+TEL 0.30-m f/3.9 reflector + CCD + CCD
+
+COD W57
+MEA F. Ocana, M. Micheli
+OBS F. Ocana, R. Kresken, L. Conversi, M. Micheli
+COM Default details extracted from MPEC 2023-M29
+TEL 0.56-m f/2.52 astrograph prime-focus corrector + 4K CCD
 
 COD W58
 OBS M. Mabson
 COM Default details extracted from MPEC 2022-O116
 TEL 0.28-m f/2.0 Schmidt-Cassegrain + CCD
 
+COD W59
+OBS T. Wildoner
+COM Default details extracted from MPEC 2022-Y15
+TEL 0.30-m f/6.3 SCT + CCD
+
+COD W60
+OBS C. Triana
+COM Default details extracted from MPEC 2025-N64
+TEL 0.25-m f/10 Schmidt-Cassegrain + CCD + f/6.3 focal reducer
+
 COD W62
 OBS J. Maikner
 COM Default details extracted from MPEC 2021-J28
 TEL 0.30-m f/3.8 Riccardi-Honders + CCD
 
-COD W68
-MEA L. Denneau, N. Erasmus, A. Fitzsimmons, A. Lawrence, J. Robinson
-MEA R. Siverd, J. Tonry, H. Weiland
-OBS L. Denneau, R. Siverd, J. Tonry, H. Weiland
-COM Default details extracted from MPEC 2022-C56
-TEL 0.5-m reflector + CCD
+COD W63
+OBS J. A. Aguirre, L. Florez, D. Ruiz
+COM Default details extracted from MPEC 2025-O40
+MEA E. A. Quintero
+TEL 0.41-m f/10.0 Schmidt-Cassegrain + CCD
+
+COD W71
+OBS G. Viscome
+COM Default details extracted from MPEC 2023-C45
+TEL 0.37-m f/6.0 Newtonian reflector + CCD
 
 COD W73
 OBS E. Meza
@@ -2734,6 +3345,10 @@ MEA R. Miles
 TEL 0.40-m f/8 Schmidt-Cassegrain + CCD
 COM Default details extracted from MPEC 2021-A100
 
+COD W91
+MEA S. Deen
+TEL 4.1-m f/3.26 reflector + CCD.
+
 COD W92
 OBS Y. Kechin, S. Bodrov, V. Lipunov, E. Gorbovskoy, N. Tiurina
 OBS P. Balanutsa, A. Kuznetsov, I. Gorbunov, F. Balakin, D. Zimnukhov
@@ -2797,26 +3412,95 @@ OBS J. L. Virlichie, P. Traverse
 COM Default details extracted from MPEC 2021-B143
 TEL 0.35-m f/4.7 Newtonian reflector + CCD
 
+COD X06
+MEA D. Husar
+OBS L. Demetz, D. Husar
+COM Default details extracted from MPEC 2023-E68
+TEL 0.40-m f/6.6 reflector + CCD
+
+COD X07
+OBS H. Sato
+COM Default details extracted from MPEC 2023-L26
+TEL 0.51-m f/6.8 astrograph + CCD
+
+COD X09
+OBS A. Schnabel, D. Ruhela
+MEA S. Deen
+COM Default details extracted from MPEC 2024-C67
+TEL 0.43-m reflector + CMOS
+
+COD X10
+MEA A. Maury, G. Attard, D. Parrott
+OBS A. Maury, G. Attard, F. Signoret
+COM Default details extracted from MPEC 2023-M100
+TEL 0.50-m f/4  reflector + CCD
+
+COD X11
+MEA M. Micheli, M.-T. Hui, Z. Huang
+COM Default details extracted from MPEC 2024-B57
+TEL 2.6-m f/5.44 reflector + CCD
+
 COD X12
 OBS A. Wilberger
 COM Default details extracted from MPEC 2020-L35
 TEL 0.20-m f/5 reflector + CCD
 
+COD X15
+OBS M. Park, G. Rochon
+COM Default details extracted from MPEC 2024-A150
+TEL 0.14-m f/7 refractor + CCD
+
+COD X19
+OBS A. Sankovich
+COM Default details extracted from MPEC 2024-U180
+TEL 0.5-m f/1.5 reflector + CMOS
+
 COD X31
 OBS C. Fornari
 COM Default details extracted from MPEC 2021-C16
 TEL 0.40-m f/8 Ritchey-Chretien + CCD
 
+COD X33
+OBS G. Nobre
+COM Default details extracted from MPEC 2023-F81
+TEL 0.20-m f/5.0 reflector + CCD
+
 COD X39
 OBS N. Suarez
 COM Default details extracted from MPEC 2022-O01
 TEL 0.25-m f/4.72 reflector + CCD
 
+COD X72
+OBS W. Reis
+COM Default details extracted from MPEC 2023-N01
+TEL 0.20-m f/6.0 RC8 + CCD
+
 COD X74
 OBS L. S. Amaral
 COM Default details extracted from MPEC 2021-B143
 TEL 0.3-m f/4 reflector + CCD
 
+COD X76
+OBS W. Ferreira
+COM Default details extracted from MPEC 2025-N35
+TEL 0.13-m f/5.0 reflector + CMO
+
+COD X77
+MEA R. G. Nazar, M. Martins
+OBS R. G. Nazar, M. Martins, A. S. Portugal
+COM Default details extracted from MPEC 2024-A150
+TEL 0.30-m f/4.7 reflector + CMO
+
+COD X93
+OBS A. Brossel
+COM Default details extracted from MPEC 2023-H34
+TEL 0.30-m f/4.0 reflector + CMO
+
+COD X89
+OBS M. Andrade
+COM Default details extracted from MPEC 2023-P47
+TEL 0.28-m f/2.0 reflector + CMO
+
 COD Y00
 COM Find_Orb default details
 CON C. Jacques, Rua Bernardino S. Figueiredo 348, Belo Horizonte, MG, Brazil
@@ -2827,6 +3511,21 @@ NET UCAC4
 COM Was TEL 0.28-m f/2.2 astrograph + CCD
 TEL 0.45-m f/2.9 astrograph + CCD
 
+COD Y01
+OBS C. Jacques, A. Caetano, E. Pimental
+MEA C. Jacques
+COM Default details extracted from MPEC 2023-O69
+TEL 0.28-m f/2.2 astrograph + CMO
+
+COD Y05
+OBS C. Jacques
+COM Default details extracted from MPEC 2023-M101
+TEL 0.45-m f/2.9 reflector + CMO
+
+COD Y16
+OBS C. H. Barreto
+COM Default details extracted from MPEC 2023-K136
+TEL 0.25-m f/4.8 reflector + CCD
 COD Y28
 COM Find_Orb default details
 CON M. Micheli
@@ -2836,11 +3535,81 @@ MEA M. Micheli, F. Monteiro
 TEL 1.0-m f/7 reflector + CCD
 NET PPMXL
 
+COD Y64
+OBS M. R. Alarcon, M. Serra-Ricart
+MEA M. R. Alarcon
+COM Default details extracted from MPEC 2024-N112
+TEL 1.00-m f/1.3 reflector + CMO
+
+COD Y65
+MEA M. Hierro
+OBS M. Serra
+COM Default details extracted from MPEC 2024-E157
+TEL 0.80-m f/6.85 reflector + CCD
+
+COD Y66
+OBS M. Serra
+COM Default details extracted from MPEC 2024-D123
+MEA M. Hierro
+TEL 0.80-m f/4.38 reflector + CMO
+
+COD Y68
+OBS F. Abarzuza
+COM Default details extracted from MPEC 2025-E148
+TEL 2.00-m f/6 reflector + CMO
+
+COD Y71
+OBS J. Ryske
+COM Default details extracted from MPEC 2024-X301
+TEL 0.30-m f/8 reflector + CMO
+
+COD Y83
+OBS O. Canales
+COM Default details extracted from MPEC 2024-J122
+TEL 0.28-m f:5.6 SC + CMO
+
+COD Y84
+MEA F. Spingler
+OBS F. Spingler, L. Spingler
+COM Default details extracted from MPEC 2024-J304
+TEL 0.20-m f/4 reflector + CMO
+
+COD Y87
+OBS J.-G. Bosch
+COM Default details extracted from MPEC 2024-E49
+TEL 0.25-m f/4.75 reflector + CMO
+
+COD Y88
+OBS I. Smith, M. Phillips
+MEA P. Devine
+COM Default details extracted from MPEC 2025-O40
+TEL 0.30-m f/4 reflector + CMO
+
+COD Y89
+OBS R. Hahn
+COM Default details extracted from MPEC 2023-Y72
+TEL 0.36-m f/2.0 reflector + CMO
+
 COD Y90
 OBS E. F. Mananes
 COM Default details extracted from MPEC 2022-S297
 TEL 0.30-m f/5.96 QHY268M + RC304 + Reductor Focal 0.66 + CCD
 
+COD Y91
+OBS P. Benarque
+COM Default details extracted from MPEC 2022-Y232
+TEL 0.12-m f/8.3 refractor + CCD
+
+COD Y95
+OBS J. Lozano
+COM Default details extracted from MPEC 2024-E157
+TEL 0.25-m f/6.3 Corrected Dall-Kirkham + CCD
+
+COD Y99
+OBS Z. Banfalvy
+COM Default details extracted from MPEC 2024-D126
+TEL 0.12-m f/5.0 Refractor + CMO
+
 COD Z03
 OBS A. Garcia
 COM Default details extracted from MPEC 2021-W31
@@ -2854,6 +3623,10 @@ COM Default details extracted from MPEC 2021-A190
 TEL 0.7-m f/8 Ritchey-Chretien + CCD
 TEL 0.7-m f/6 reflector + CCD
 
+COD Z09
+OBS W. Hawley
+COM Default details extracted from MPEC 2025-N22
+TEL 0.36-m f/6.7 SCT + CCD
 COD Z10
 OBS P. Carson
 COM Default details extracted from MPEC 2021-B143
@@ -2870,6 +3643,15 @@ OBS J. Licandro, A. Cabrera-Lavers
 MEA M. Micheli, F. J. Pozuelos, D. Farnocchia
 TEL 10.40-m reflector + CCD
 
+COD Z19
+MEA M. Micheli
+OBS E. Mazzotta Epifani, I. Bertini, L. Inno, A. Rotundi, S. Fiscale
+OBS M. Scuderi, C. Tubiana, A. Migliorini, V. Della Corte
+OBS A. M. Piccirillo, C. Snodgrass, A. Guilbert-Lepoutre, R. Kokotanekova
+OBS M. M. Knight, C. Holt, M. Pedani, H. Stoev, A. F. Martinez Fiorenzano
+COM Default details extracted from MPEC 2025-M120
+TEL 3.58-m reflector + CCD
+
 COD Z21
 OBS T. Lister, J. Chatelain, E. Gomez, S. Greenstreet
 MEA T. Lister
@@ -2948,6 +3730,11 @@ COM Default details extracted from MPEC 2021-S43
 OBS F. Calvo
 TEL 0.16-m f/3.3 reflector + CCD
 
+COD Z43
+OBS C. Ratinaud
+COM Default details extracted from MPEC 2023-C59
+TEL 0.25-m f/4.7 Reflector + CCD
+
 COD Z45
 OBS F. Jackson
 COM Default details extracted from MPEC 2020-P19
@@ -2974,11 +3761,22 @@ NET UCAC-4
 COM Valid: 2018 Jun 12 - 2100
 NET Gaia-DR2
 
+COD Z53
+MEA M. Micheli, E. Jehin
+OBS E. Jehin
+COM Default details extracted from MPEC 2024-L77
+TEL 0.60-m f/8 reflector + CCD
+
 COD Z55
 OBS R. Farfan
 COM Default details extracted from MPEC 2021-B143
 TEL 0.28-m f/6.3 Schmidt-Cassegrain + CCD
 
+COD Z57
+OBS C. Malagon
+COM Default details extracted from MPEC 2023-C42
+TEL 0.30-m f/5 Ritchey-Chretien + CCD
+
 COD Z58
 COM Find_Orb default details
 CON M. Micheli
@@ -3023,8 +3821,8 @@ NET Gaia-DR2
 
 COD Z84
 COM Find_Orb default details
-OBS E. Schwab
-MEA E. Schwab, D. Koschny, M. Micheli
+OBS R. Kresken, F. Oca\~na, M. Micheli, L. Conversi
+MEA F. Oca\~na, M. Micheli, R. Kresken
 TEL 0.8-m f/3 Schmidt + CCD
 
 COD Z92
@@ -3043,54 +3841,164 @@ OBS A. Mickleburgh
 COM Default details extracted from MPEC 2021-B143
 TEL 0.36-m f/8 Schmidt-Cassegrain + CCD
 
+COD Multi F51  F52
+COM Valid: 2024 aug 1 - 2100
+MEA K. Chambers, T. de Boer, J. Fairlamb, H. Gao, M. Huber, C.-C. Lin
+MEA E. Magnier, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+OBS J. Herman, T. Lowe, P. Minguez, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2024-U09 (2024 Oct 17)
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2024 feb 1 - 2024 aug 1
+MEA K. Chambers, T. de Boer, J. Fairlamb, H. Gao, M. Huber, C.-C. Lin
+MEA E. Magnier, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+OBS J. Herman, T. Lowe, P. Minguez, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2024-K08 (2024 May 17)
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2023 aug 1 - 2024 feb 1
+MEA K. Chambers, T. de Boer, J. Fairlamb, H. Gao, M. Huber, C.-C. Lin
+MEA E. Magnier, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+OBS J. Bulger, T. Lowe, P. Minguez, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2023-U284
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2023 feb 1 - 2024 aug 1
+MEA K. Chambers, T. de Boer, J. Bulger, J. Fairlamb, H. Gao, M. Huber
+MEA C.-C. Lin, T. Lowe, E. Magnier, P. Minguez, Y. Ramanjooloo, A. Schultz
+MEA I. Smith, R. Wainscoat, R. Weryk
+OBS J. Bulger, T. Lowe, P. Minguez, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2023-K192
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2022 aug 1 - 2023 feb 1
+MEA S. Chastel, J. Fairlamb, M. Huber, Y. Ramanjooloo, R. Wainscoat
+MEA R. Weryk
+OBS J. Bulger, K. Chambers, T. Lowe, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2022-U406
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2021 nov 1 - 2022 aug 1
+MEA K. Chambers, S. Chastel, T. de Boer, J. Fairlamb, H. Gao, M. Huber
+MEA C.-C. Lin, E. Magnier, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+OBS J. Bulger, T. Lowe, A. Schultz, I. Smith, K. Chambers, T. Dukes
+COM Default details extracted from MPEC 2022-K175
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2020 nov 1 - 2021 nov 1
+MEA S. Chastel, M. Huber, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+OBS J. Bulger, K. Chambers, T. Lowe, A. Schultz, I. Smith
+COM Default details extracted from MPEC 2021-K106
+TEL 1.8-m Ritchey-Chretien + CCD
+
+COM Valid: 2019 nov 1 - 2020 nov 1
+MEA S. Chastel, M. Huber, Y. Ramanjooloo, R. Wainscoat, R. Weryk
+MEA K. Chambers, T. de Boer, L. Denneau, J. Fairlamb, H. Flewelling
+MEA C.-C. Lin, E. Magnier
+OBS J. Bulger, K. Chambers, T. Lowe, A. Schultz, M. Willman
+COM Default details extracted from MPEC 2020-K234
+TEL 1.8-m Ritchey-Chretien + CCD
+
+   MPECs with data for CSS sites (703),  (E12),  (I52),  (G96),  and (V06)
+   list everybody who worked at CSS at the time in question.  Properly speaking,
+   we should list one "observer" (person actually at the scope) and everybody
+   else as "measurers",  but we don't really know who that one person was.
+   For CSS,  unlike ATLAS and PanSTARRS,  the telescopes differ from site
+   to site;  look under COD 703,  COD E12,  etc. for scope details.
+
 COD Multi 703  E12  G96  I52  V00  V06
-COM Valid: 2019 Jan 20 - 2100
-OBS T. A. Pruyne
-COM Valid: 2018 Jan 1 - 2100
-OBS B. M. Africano
-COM Valid: 2010-2014
-OBS J. D. Ahern
-COM Valid: 1900-2014
-OBS E. C. Beshore
-COM Valid: 2006-2014
-OBS A. Boattini
-COM Valid: 2004 jul 1 - 2006
-OBS C. M. Casey
-COM Valid: 2011-2100
-OBS E. J. Christensen
-COM Valid: 2018 Jul 1 - 2300
-OBS G. A. Farneth
-COM Valid: 2014 Jan 1 - 2300
-OBS D. C. Fuls
-COM Valid: 2004 jul 1-2011
-OBS G. J. Garradd
-COM Valid: 2006-2100
-OBS A. R. Gibbs, A. D. Grauer
-COM Valid: 2018 may 1 - 2100
-OBS H. Groeller
-COM Valid: 1999 jan 1 - 2015 Oct 1
-OBS R. E. Hill
-COM Valid: 2014-2100
-OBS J. A. Johnson
-COM Valid: 1900 - 2004 jul 1
-OBS S. Kolar
-COM Valid: 2006 - 2100
-OBS R. A. Kowalski
-COM Valid: 2004 jul 1 - 2100
-OBS S. M. Larson
-COM Valid: 2014 - 2100
-OBS G. J. Leonard
-COM Valid: 2014 - 2018 Feb 20
-OBS R. G. Matheny
-COM Valid: 1900-2004 jul 1
-OBS D. McLean
-COM Valid: 2004 jul 1 - 2015
-OBS R. H. McNaught
-COM Valid: 2019 - 2100
-OBS D. Rankin
-COM Valid: 2014 - 2100
-OBS R. L. Seaman
-COM Valid: 2014 - 2100
-OBS F. C. Shelly
-COM Valid: 2019 Oct 1 - 2100
-OBS K. W. Wierzchos
+COM Valid: 2024 aug 1 - 2100
+MEA T. Beuden, V. F. Carvajal, D. Fay, J. B. Fazekas, D. C. Fuls
+MEA A. R. Gibbs, A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski
+MEA S. M. Larson, G. J. Leonard, D. Rankin, R. L. Seaman, F. C. Shelly
+MEA K. W. Wierzchos
+COM Default details extracted from MPEC 2024-U09 (2024 Oct 17)
+
+COM Valid: 2024 feb 1 - 2024 aug 1
+MEA T. Beuden, V. F. Carvajal, D. Fay, J. B. Fazekas, D. C. Fuls
+MEA A. R. Gibbs, A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski
+MEA S. M. Larson, G. J. Leonard, D. Rankin, R. L. Seaman, F. C. Shelly
+MEA K. W. Wierzchos
+COM Default details extracted from MPEC 2024-K08 (2024 May 17)
+
+COM Valid: 2023 aug 1 - 2024 feb 1
+MEA E. C. Beshore, D. Fay, J. B. Fazekas, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski, S. M. Larson
+MEA G. J. Leonard, D. Rankin, R. L. Seaman, F. C. Shelly, K. W. Wierzchos
+COM Default details extracted from MPEC 2023-U284
+
+COM Valid: 2023 feb 1 - 2023 aug 1
+MEA E. J. Christensen, D. Fay, J. B. Fazekas, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski, S. M. Larson
+MEA G. J. Leonard, D. Rankin, R. L. Seaman, A. Serrano, F. C. Shelly
+MEA K. W. Wierzchos
+COM Default details extracted from MPEC 2023-K192
+
+COM Valid: 2022 aug 1 - 2023 feb 1
+MEA E. J. Christensen, D. Fay, J. B. Fazekas, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski, S. M. Larson
+MEA G. J. Leonard, D. Rankin, R. L. Seaman, A. Serrano, F. C. Shelly
+MEA K. W. Wierzchos
+COM Default details extracted from MPEC 2022-U407
+
+COM Valid: 2021 nov 1 - 2022 aug 1
+MEA E. J. Christensen, D. Fay, J. B. Fazekas, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, J. K. Hogan, R. A. Kowalski, S. M. Larson
+MEA G. J. Leonard, D. Rankin, R. L. Seaman, A. Serrano, F. C. Shelly
+MEA K. W. Wierzchos
+COM Default details extracted from MPEC 2022-K176
+
+COM Valid: 2020 nov 1 - 2021 nov 1
+MEA E. J. Christensen, G. A. Farneth, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, R. A. Kowalski, S. M. Larson, G. J. Leonard
+MEA T. A. Pruyne, D. Rankin, R. L. Seaman, F. C. Shelly, K. W. Wierzchos
+COM Default details extracted from MPEC 2021-K105
+
+COM Valid: 2019 nov 1 - 2020 nov 1
+MEA E. J. Christensen, G. A. Farneth, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, H. Groeller, R. A. Kowalski, S. M. Larson, G. J. Leonard
+MEA T. A. Pruyne, D. Rankin, R. L. Seaman, F. C. Shelly, K. W. Wierzchos
+COM Default details extracted from MPEC 2020-K227
+
+COM Valid: 2015 jul 1 - 2016 jul 1
+MEA E. J. Christensen, D. C. Fuls, A. R. Gibbs
+MEA A. D. Grauer, J. A. Johnson, R. A. Kowalski, S. M. Larson, G. J. Leonard
+MEA R. G. Matheny,  R. L. Seaman, F. C. Shelly
+COM Default details extracted from MPEC 2015-Y97
+
+COD Multi M22  T05  T08  W68
+
+COM Valid: 2024 jan 1 - 2100 nov 1
+MEA L. Denneau, N. Erasmus, A. Fitzsimmons, J. Robinson, R. Siverd
+MEA J. Tonry, H. Weiland
+OBS L. Denneau, R. Siverd, J. Tonry, H. Weiland
+COM Default details extracted from MPEC 2024-U02 (2024 Oct 16)
+TEL 0.5-m f/2.0 Schmidt + CCD
+
+COM Valid: 2021 dec 1 - 2024 jan 1
+MEA L. Denneau, N. Erasmus, A. Fitzsimmons, A. Lawrence, J. Robinson
+MEA R. Siverd, J. Tonry, H. Weiland
+OBS L. Denneau, R. Siverd, J. Tonry, H. Weiland
+COM Default details extracted from MPEC 2023-U150 (2023 oct 20)
+TEL 0.5-m f/2.0 Schmidt + CCD
+
+COM Valid: 2020 dec 1 - 2021 dec 1
+MEA L. Denneau, J. Tonry, A. Heinze, H. Weiland, A. Fitzsimmons
+MEA J. Robinson, N. Erasmus
+OBS L. Denneau, J. Tonry, A. Heinze, H. Weiland
+COM Default details extracted from MPEC 2021-K100
+TEL 0.5-m f/2.0 Schmidt + CCD
+
+COM Valid: 1900 dec 1 - 2020 dec 1
+MEA L. Denneau, J. Tonry, A. Heinze, H. Weiland, H. Flewelling, B. Stalder
+MEA A. Fitzsimmons, J. Robinson, N. Erasmus
+OBS L. Denneau, J. Tonry, A. Heinze, H. Weiland, H. Flewelling
+COM Default details extracted from MPEC 2020-K228
+TEL 0.5-m f/2.0 Schmidt + CCD
+
+COD Def
+COM For ADES,  you _must_ supply a contact, measurer,  and telescope.
+COM If none are supplied for a given obscode,  the following are used.
+CON U. N. Known
+MEA U. N. Known
+TEL 0.1-m unknown
diff --git a/dos_find.mak b/dos_find.mak
index fbd1b1d1..dde679d9 100755
--- a/dos_find.mak
+++ b/dos_find.mak
@@ -7,21 +7,21 @@
 
 all: find_orb.exe fo.exe
 
-OBJS=ades_out.obj b32_eph.obj bc405.obj bias.obj collide.obj   \
+OBJS=ades_out.obj bc405.obj bias.obj collide.obj   \
   conv_ele.obj details.obj eigen.obj elem2tle.obj elem_out.obj  \
   elem_ou2.obj ephem0.obj errors.obj expcalc.obj gauss.obj  \
   geo_pot.obj healpix.obj lsquare.obj miscell.obj  \
-  monte0.obj mpc_obs.obj nanosecs.obj \
+  monte0.obj mpc_obs.obj  \
   orb_func.obj orb_fun2.obj pl_cache.obj roots.obj runge.obj \
   shellsor.obj sigma.obj simplex.obj sm_vsop.obj sr.obj stackall.obj
 
 CCLIBS      = user32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib
 !ifdef BITS_32
-CFLAGS=-Ot -W3 -nologo -MT -DCONSOLE -I../PDCursesMod
+CFLAGS=-Ot -W3 -nologo -MT -I../PDCursesMod
 ADD_LIBS    = sat_code32.lib jpleph32.lib lunar.lib
 RM=rm
 !else
-CFLAGS=-Ot -W3 -nologo -MT -DCONSOLE -I../PDCursesMod -D_CRT_SECURE_NO_WARNINGS
+CFLAGS=-Ot -W3 -nologo -MT -I../PDCursesMod -D_CRT_SECURE_NO_WARNINGS
 ADD_LIBS    = sat_code64.lib jpleph64.lib lunar64.lib
 RM=del
 !endif
@@ -35,7 +35,7 @@ cssfield.exe: cssfield.cpp
 
 find_orb.exe:               findorb.obj $(OBJS) clipfunc.obj getstrex.obj
      link /out:find_orb.exe findorb.obj $(OBJS) clipfunc.obj getstrex.obj \
-                       pdcurses.lib user32.lib $(CCLIBS) $(ADD_LIBS)
+                       pdcurses.lib user32.lib winmm.lib $(CCLIBS) $(ADD_LIBS)
 
 fo.exe:                     fo.obj $(OBJS)
      link /out:fo.exe       fo.obj $(OBJS) $(ADD_LIBS)
@@ -77,7 +77,6 @@ clean_temp:
    $(RM) elem_short.json
    $(RM) ephemeri.txt
    $(RM) ephemeri.json
-   $(RM) eph_json.txt
    $(RM) gauss.out
    $(RM) guide.txt
    $(RM) linkage.json
diff --git a/dos_help.txt b/dos_help.txt
index ce90b92f..5f599322 100644
--- a/dos_help.txt
+++ b/dos_help.txt
@@ -1,4 +1,4 @@
-   Version date: 2021 Oct 05
+   Version date: 2024 Jan 08
 
    The parameters shown in this software are basically the same as those
 shown in the Windows software,  as described at
@@ -6,9 +6,12 @@ shown in the Windows software,  as described at
 https://www.projectpluto.com/find_orb.htm
 
    Commands are very different,  because they are all keyboard based (but
-you can do a fair bit with the mouse;  see end of this text.)
+you can do a fair bit with the mouse;  see end of this text.)  You can also
+click on menu items on the top line (click [+] to get more menu items).
 
 ?      (Or any other unrecognized key) Shows this file (dos_help.txt).
+.      Show version of Find_Orb,  ephems,  etc.  (splash screen)
+c      Show calendar with lunar phases
 
    ORBIT-FITTING COMMANDS:
 
@@ -16,14 +19,17 @@ r      Reset R1 and R2,  for use in the method of Herget.  Results in being
        prompted to type in new values for both.  By default, units are AU,
        but one can append 'km';  e.g.,  '.01 500000km' or '10000km 20000km'
        are interpreted logically.  Enter one value,  and R1=R2 is assumed.
+       (Can click on the R1/R2 displayed to access this option.)
 e      Reset the epoch.  Results in being prompted to enter a new epoch.
        This can be simply a JD ("2451000.5") or a year/month/day ("2004
        10 2").  Or you can enter,  say,  "+20" to advance the epoch 20
        days,  or "-40" to set it back 40 days,  etc.  Or "now" to set the
-       epoch to today,  or "now-7" to set it to a week ago.
+       epoch to today,  or "now-7" to set it to a week ago.  (You can click
+       on the epoch shown in the orbital elements to get this option.)
 v      Find Va'isa'la' orbit.  You'll be prompted to enter a perihelion
          (or aphelion) distance;  it will then find a 'best fit' orbit with
          that apsis distance at the center of the arc.
+V      Find Va'isa'la' orbit, without linearizing.
 l      Set a Limited orbit (e.g,  "e=.1",  "q=12.4",  "a=2.3,e=.15").
 h      Take one step using the method of Herget.
 f      Take one "full step" using the method of least squares.
@@ -33,6 +39,12 @@ g      Determine orbit with method of Gauss.  (There may be alternative
          generating variants until you hit another key to stop it.  Observe
          the changes in the orbital elements,  and you get an idea of the
          level of uncertainty.  (Elements will also be stored in 'mpcorb.dat'.)
+Alt-G  Generate a MC orbital (elements stored in mpc_sr.txt for 
+       mpcorb formt i.e. 1-line)
+Ctrl-D Generate a number of statistical ranging virtual asteroid variant orbits. 
+         (Elements will also be stored in 'mpcorb.dat'.)
+Ctrl-R Reset R1 and R2, for use in the Statistical Ranging method.
+Alt-M  Metropolis-Hastings method.  
 :      'Linearizes' the orbit,  as described at:
          https://www.projectpluto.com/vaisala.htm#linearized
 #      Uses a downhill simplex method,  as described at
@@ -44,7 +56,8 @@ F12    Find a circular orbit connecting the first and last positions.  Hit
          solutions.  If the arc is long enough,  there may be multiple-orbit
          solutions,  including many spurious retrograde ones.  (Or there may
          be no circular orbits at all.)
-
+Alt-F  For orbit extension, improve along the line of variations
+         
    INTEGRATION MODEL COMMANDS (perturbers, non-grav effects):
 
 1...9  Toggle inclusion of Mercury...Pluto as a perturbing object.
@@ -55,14 +68,19 @@ a      Toggle inclusion of up to 300 asteroids.  (See documentation for
          details,  including on how to limit/increase asteroid use.)  NOTE
          that this can slow things down a bit and appears to rarely matter.
 *      Non-grav model selection.  You can choose among various non-grav
-         models for solar radiation pressure or comet outgassing.  Click
-         on the [?] shown in the menu for details.
+         models for solar radiation pressure,  comet outgassing models,  or
+         Yarkovsky.  Click on the [?] shown in the menu for details.
+Alt-P Reset r0, m, n, and k 'comet constants' of the non-gravtational force g(r). 
+         Default are for water sublimation, see'environ.def' comments for 
+         COMET_CONSTRAINTS. 
+Alt-Z Integration method selection. Cycles between Runge-Kutta-Fehlber 'RKF' or
+         Dormand-Prince 8(9) 'RD89'.
 
       OBSERVATION TOGGLING/WEIGHTING/SEARCHING:
 
-F1 or Alt-U
-       Toggle all observations prior to the currently-selected one.
-F2     Toggle all observations after the currently-selected one.
+Shift-Up
+          Toggle all observations prior to the currently-selected one.
+Shift-Dn  Toggle all observations after the currently-selected one.
 F3     Toggle all observations for the currently-selected observatory.  This
          lets you,  say,  "shut off all 703 observations."
 F4     Find previous observation from the current observatory.
@@ -83,6 +101,10 @@ Ctrl-Up   Find the last observation of the preceding opposition
 Ctrl-Dn   Find the first observation of the next opposition
 Alt-X   Gets you a list of all MPC codes for the current object;  click on
             one,  and the next observation from that code will be found
+            (you can click on 'Obs' in the observation legend to get this)
+T       Select all observations in the current tracklet.
+X       Toggle all observations in the current tracklet.
+Alt-W   Toggle (on/off) the use of weighting of posns/mags/times
 
             ON-SCREEN DISPLAY:
 
@@ -98,17 +120,14 @@ Shift-F7    Toggle between the 'pure' MPC-formatted eight-line elements,  with
          a particular central object (which can be the barycenter of the
          solar system).
          of residuals are shown.
-j      Toggles the two lines showing which perturbers are included,  R1 and R2,
-         orbital restrictions,  and the step size.  When shut off,  two
-         more lines of residuals are shown.
-;      Toggles display of the "residual legend",  which explains what the
-         assorted data in the residual area mean.
+i      Show 'alternative' information about the currently selected observation
 -      Cycles display of the list of observatories among three options:
          just data for the observatory for the currently-selected observation;
          use about a third of the observation area for observatory data;
          or use most of that area for observatory data.
-Alt-K  Toggle display of observational uncertainties in columns 57 to 65 of
-         the MPC 80-column format.  Those columns usually go unused.
+Alt-K  Cycles display of columns 57 to 65 of the MPC 80-column format through
+         three options : show what's there from the original data (usually
+         nothing);  show uncertainties;  show the packed designation.
 &      Select format for observation RA/decs (minutes/seconds or decimal
          degrees).  You can also get this by clicking on "RA (J2000)  dec"
          on the black-on-cyan observation legend line.
@@ -120,6 +139,7 @@ Alt-N  Get options for the orbital elements frame (ecliptic,  equatorial,
 Ctrl-B Toggle display of some "alternative" orbital element data,  such as
          MOIDs for all planets,  encounter velocity,  etc.  You can also do
          this by clicking on the orbital elements area.
+
         RESIDUAL-RELATED COMMANDS:
 
 Cursor keys :  move up/down one observation,  or a "page" up/down
@@ -212,7 +232,6 @@ z      Integrate current orbit forward,  then back,  a certain number of
 "      Shows details of Curses mouse commands (these differ from one platform
          to the next,  and I needed a way to puzzle them out),  and info on
          the DE file currently in use.
-.      Show flavor of Curses,  DE and Find_Orb version info in use.
 ,      Show 'debug.txt' (log of debug messages).
 \      Shift all observations from a given observatory by a given time offset.
          Used when I was trying to puzzle out some timing errors from a
@@ -320,23 +339,33 @@ ahead by that many seconds).
 
 New moon dates for the next few years :
 
-2016 May  6     2017 Dec 18     2019 Aug  1     2021 Mar 13     2022 Oct 25
-2016 Jun  5     2018 Jan 17     2019 Aug 30     2021 Apr 12     2022 Nov 23
-2016 Jul  4     2018 Feb 15     2019 Sep 28     2021 May 11     2022 Dec 23
-2016 Aug  2     2018 Mar 17     2019 Oct 28     2021 Jun 10     2023 Jan 21
-2016 Sep  1     2018 Apr 16     2019 Nov 26     2021 Jul 10     2023 Feb 20
-2016 Oct  1     2018 May 15     2019 Dec 26     2021 Aug  8     2023 Mar 21
-2016 Oct 30     2018 Jun 13     2020 Jan 24     2021 Sep  7     2023 Apr 20
-2016 Nov 29     2018 Jul 13     2020 Feb 23     2021 Oct  6     2023 May 19
-2016 Dec 29     2018 Aug 11     2020 Mar 24     2021 Nov  4     2023 Jun 18
-2017 Jan 28     2018 Sep  9     2020 Apr 23     2021 Dec  4     2023 Jul 17
-2017 Feb 26     2018 Oct  9     2020 May 22     2022 Jan  2     2023 Aug 16
-2017 Mar 28     2018 Nov  7     2020 Jun 21     2022 Feb  1     2023 Sep 15
-2017 Apr 26     2018 Dec  7     2020 Jul 20     2022 Mar  2     2023 Oct 14
-2017 May 25     2019 Jan  6     2020 Aug 19     2022 Apr  1     2023 Nov 13
-2017 Jun 24     2019 Feb  4     2020 Sep 17     2022 Apr 30     2023 Dec 12
-2017 Jul 23     2019 Mar  6     2020 Oct 16     2022 May 30     2024 Jan 11
-2017 Aug 21     2019 Apr  5     2020 Nov 15     2022 Jun 29     2024 Feb  9
-2017 Sep 20     2019 May  4     2020 Dec 14     2022 Jul 28     2024 Mar 10
-2017 Oct 19     2019 Jun  3     2021 Jan 13     2022 Aug 27     2024 Apr  8
-2017 Nov 18     2019 Jul  2     2021 Feb 11     2022 Sep 25     2024 May  8
+2019 Dec 26     2022 May 30     2024 Nov  1     2027 Apr  6     2029 Sep  8
+2020 Jan 24     2022 Jun 29     2024 Dec  1     2027 May  6     2029 Oct  7
+2020 Feb 23     2022 Jul 28     2024 Dec 30     2027 Jun  4     2029 Nov  6
+2020 Mar 24     2022 Aug 27     2025 Jan 29     2027 Jul  4     2029 Dec  5
+2020 Apr 23     2022 Sep 25     2025 Feb 28     2027 Aug  2     2030 Jan  4
+2020 May 22     2022 Oct 25     2025 Mar 29     2027 Aug 31     2030 Feb  2
+2020 Jun 21     2022 Nov 23     2025 Apr 27     2027 Sep 30     2030 Mar  4
+2020 Jul 20     2022 Dec 23     2025 May 27     2027 Oct 29     2030 Apr  2
+2020 Aug 19     2023 Jan 21     2025 Jun 25     2027 Nov 28     2030 May  2
+2020 Sep 17     2023 Feb 20     2025 Jul 24     2027 Dec 27     2030 Jun  1
+2020 Oct 16     2023 Mar 21     2025 Aug 23     2028 Jan 26     2030 Jun 30
+2020 Nov 15     2023 Apr 20     2025 Sep 21     2028 Feb 25     2030 Jul 30
+2020 Dec 14     2023 May 19     2025 Oct 21     2028 Mar 26     2030 Aug 28
+2021 Jan 13     2023 Jun 18     2025 Nov 20     2028 Apr 24     2030 Sep 27
+2021 Feb 11     2023 Jul 17     2025 Dec 20     2028 May 24     2030 Oct 26
+2021 Mar 13     2023 Aug 16     2026 Jan 18     2028 Jun 22     2030 Nov 25
+2021 Apr 12     2023 Sep 15     2026 Feb 17     2028 Jul 22     2030 Dec 24
+2021 May 11     2023 Oct 14     2026 Mar 19     2028 Aug 20     2031 Jan 23
+2021 Jun 10     2023 Nov 13     2026 Apr 17     2028 Sep 18     2031 Feb 21
+2021 Jul 10     2023 Dec 12     2026 May 16     2028 Oct 18     2031 Mar 23
+2021 Aug  8     2024 Jan 11     2026 Jun 15     2028 Nov 16     2031 Apr 21
+2021 Sep  7     2024 Feb  9     2026 Jul 14     2028 Dec 16     2031 May 21
+2021 Oct  6     2024 Mar 10     2026 Aug 12     2029 Jan 14     2031 Jun 19
+2021 Nov  4     2024 Apr  8     2026 Sep 11     2029 Feb 13     2031 Jul 19
+2021 Dec  4     2024 May  8     2026 Oct 10     2029 Mar 15     2031 Aug 18
+2022 Jan  2     2024 Jun  6     2026 Nov  9     2029 Apr 13     2031 Sep 16
+2022 Feb  1     2024 Jul  5     2026 Dec  9     2029 May 13     2031 Oct 16
+2022 Mar  2     2024 Aug  4     2027 Jan  7     2029 Jun 12     2031 Nov 14
+2022 Apr  1     2024 Sep  3     2027 Feb  6     2029 Jul 11     2031 Dec 14
+2022 Apr 30     2024 Oct  2     2027 Mar  8     2029 Aug 10     2032 Jan 12
diff --git a/efindorb.txt b/efindorb.txt
index 0dd0c707..155ba00b 100644
--- a/efindorb.txt
+++ b/efindorb.txt
@@ -130,11 +130,11 @@
 22      All Perturbers Off
 
 900     English
-901     French
-902     Italian
-903     Russian
-904     Spanish
-905     German
+901     Français
+902     Italiano
+903     русский
+904     Español
+905     Deutsch
 
 # months
 1000    January
@@ -194,10 +194,7 @@
 
 2009    %u observations were duplicates.  They have been removed.
 
-2010    %u satellite observations had incorrect offset data.  The file
-2010    'debug.txt' may have further information.  These observations
-2010    have been excluded.  See https://www.projectpluto.com/sc_obs.htm
-2010    for more information.
+2010    See https://www.projectpluto.com/sc_obs.htm FMI.
 
 2011    %u observations were incorrectly formatted.  These observations
 2011    will be ignored.
@@ -265,8 +262,9 @@
 2030    https://www.projectpluto.com/find_orb.htm#de_eph for more info.
 
 2031    F Select file containing astrometry
-2031    C Copy astrometry from clipboard
 2031    N Give object name and get data from MPC
+2031    C Copy astrometry from clipboard
+2031    S Copy astrometry from selection
 
 2033    Use arrow keys to select object,  then hit the space bar or Enter (or use mouse)
 
@@ -277,11 +275,11 @@
 2034    Cancel
 
 2035    English
-2035    French
-2035    Italian
-2035    Russian
-2035    Spanish
-2035    German
+2035    Français
+2035    Italiano
+2035    русский
+2035    Español
+2035    Deutsch
 
 2036    Help about this dialog
 2036    Select file of observations
@@ -353,6 +351,7 @@
 2060    5 ( ) Comet model (A1, A2, A3)
 2060    6 ( ) Comet model (A1, A2, A3, DT)
 2060    7 ( ) Yarkovsky (A2-only)
+2060    8 ( ) Delta-V
 2060    Cancel
 
 2062    0 ( ) Resids in RA/dec arcsec
@@ -384,10 +383,35 @@
 2070    3 ( ) Times in MJD DDDDD.DDDDDD
 2070    Cancel
 
-2072    At least one observation,  made at %s from (%s),
-2072    has an uncertainty in %s that is less than its precision.
-2072    This doesn't make sense, and indicates something's wrong with
-2072    the data or with its uncertainty.  See
-2072    https://www.projectpluto.com/errors.htm#precision
-2072    for further discussion.  Be warned that there may be other errors.
-2072    Find_Orb will only warn you about the first one it finds.
+2074    Temporary designations must include only alphanumeric characters or
+2074    '-' or underscores.  The designation '%s' would be rejected by MPC.
+
+2076    Clipboard is empty!
+
+2078    0 ( ) "/min = '/hr
+2078    1 ( ) "/sec = '/min = deg/hour
+2078    2 ( ) '/sec = deg/min
+2078    3 ( ) '/day
+2078    4 ( ) d/day
+2078    Cancel
+
+2080    No MPC astrometry found for object '%s'.  This may be
+2080    an unused or incorrectly formatted designation,  or MPC
+2080    may simply not have data for it.
+
+2090    %d satellite offsets had no errors\n
+2091    %d satellite offsets had incorrect signs\n
+2092    %d had no number(s) or garbled number(s)\n
+2093    %d satellite offsets had no decimal point\n
+2094    %d satellite offsets had a misplaced decimal point\n
+2095    %d satellite offsets had undeciphered offsets\n
+2096    %d satellite offsets were at the geocenter\n
+2097    %d satellite offsets were inside the earth\n
+
+2099    Enter initial guess for time of delta-V :
+
+2101    Enter number of desired variant orbits :
+
+2103    Residuals in arcseconds
+2104    Residuals in seconds along-track and arcseconds cross-track
+2105    Normalized residuals
diff --git a/elem2tle.cpp b/elem2tle.cpp
index 8a181646..222cbf59 100644
--- a/elem2tle.cpp
+++ b/elem2tle.cpp
@@ -100,9 +100,13 @@ int write_tle_from_vector( char *buff, const double *state_vect,
 {
    tle_t tle;
    int rval = 0;
+   double revs_per_day;
 
    memset( &tle, 0, sizeof( tle_t));
    rval = vector_to_tle( &tle, state_vect, epoch);
+   revs_per_day = tle.xno * minutes_per_day / (2. * PI);
+   if( revs_per_day > 50.)   /* meaningless suborbital TLE */
+      rval = -1;
    if( !rval)
       {
       if( norad_desig)
diff --git a/elem_ou2.cpp b/elem_ou2.cpp
index 39054cf6..81b4bbfa 100644
--- a/elem_ou2.cpp
+++ b/elem_ou2.cpp
@@ -186,13 +186,13 @@ int put_elements_into_sof( char *obuff, const char *templat,
                   (right_justify ? "%*s" : "%-*s"), (int)i, text_to_put);
       else if( val_to_put)
          {
-         size_t j = 1;
+         size_t k = 1;
 
-         while( j < i && templat[j] != '.')
-            j++;
-         if( j == i)       /* no decimal point found */
-            j = 0;
-         snprintf( obuff, i + 1, "%*.*f", (int)i, (int)(i - j) - 1, val_to_put);
+         while( k < i && templat[k] != '.')
+            k++;
+         if( k == i)       /* no decimal point found */
+            k = 0;
+         snprintf( obuff, i + 1, "%*.*f", (int)i, (int)(i - k) - 1, val_to_put);
          }
       else if( integer_to_put)
          snprintf( obuff, i + 1, "%*d", (int)i, integer_to_put);
diff --git a/elem_out.cpp b/elem_out.cpp
index 08211915..16908de7 100644
--- a/elem_out.cpp
+++ b/elem_out.cpp
@@ -57,8 +57,10 @@ bool findorb_already_running = false;
 #endif
 
 static const char *_extras_filename = "hints.txt";
+static const char *_default_extras_filename = "hints.def";
 extern int available_sigmas;
 extern double optical_albedo;
+extern unsigned perturbers;
 
 #ifdef NOT_CURRENTLY_IN_USE
 #define ssnprintf_append( obuff, ...) snprintf_append( obuff, sizeof( obuff), __VA_ARGS__)
@@ -67,10 +69,10 @@ extern double optical_albedo;
 int store_defaults( const ephem_option_t ephemeris_output_options,
          const int element_format, const int element_precision,
          const double max_residual_for_filtering,
-         const double noise_in_arcseconds);           /* elem_out.cpp */
+         const double noise_in_sigmas);           /* elem_out.cpp */
 int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
          int *element_precision, double *max_residual_for_filtering,
-         double *noise_in_arcseconds);                /* elem_out.cpp */
+         double *noise_in_sigmas);                /* elem_out.cpp */
 int64_t nanoseconds_since_1970( void);                      /* mpc_obs.c */
 static int elements_in_mpcorb_format( char *buff, const char *packed_desig,
                 const char *full_desig, const ELEMENTS *elem,
@@ -81,10 +83,7 @@ static int elements_in_guide_format( char *buff, const ELEMENTS *elem,
 FILE *open_json_file( char *filename, const char *env_ptr, const char *default_name,
                   const char *packed_desig, const char *permits); /* ephem0.cpp */
 int find_worst_observation( const OBSERVE FAR *obs, const int n_obs);
-double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit);
 int set_locs( const double *orbit, double t0, OBSERVE FAR *obs, int n_obs);
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
 void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
                   const double epoch);                  /* orb_func.cpp */
 double calc_obs_magnitude( const double obj_sun,
@@ -93,6 +92,11 @@ int find_best_fit_planet( const double jd, const double *ivect,
                                  double *rel_vect);         /* runge.cpp */
 void find_relative_state_vect( const double jd, const double *ivect,
                double *ovect, const int ref_planet);        /* runge.cpp */
+int find_central_object( const OBSERVE *obs, const double epoch_shown,
+                        const double *ivect, double *ovect);  /* elem_out.c */
+void compute_effective_solar_multiplier( const char *constraints);   /* runge.c */
+int get_orbit_from_mpcorb_sof( const char *object_name, double *orbit,
+             ELEMENTS *elems, const double full_arc_len, double *max_resid);
 const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
 void remove_trailing_cr_lf( char *buff);      /* ephem0.cpp */
 int write_tle_from_vector( char *buff, const double *state_vect,
@@ -107,7 +111,6 @@ int get_idx1_and_idx2( const int n_obs, const OBSERVE FAR *obs,
 double mag_band_shift( const char mag_band, int *err_code);   /* elem_out.c */
 int get_jpl_ephemeris_info( int *de_version, double *jd_start, double *jd_end);
 double *get_asteroid_mass( const int astnum);   /* bc405.cpp */
-double current_jd( void);                       /* elem_out.cpp */
 double centralize_ang( double ang);             /* elem_out.cpp */
 char *get_file_name( char *filename, const char *template_file_name);
 void get_relative_vector( const double jd, const double *ivect,
@@ -118,17 +121,17 @@ double get_planet_mass( const int planet_idx);                /* orb_func.c */
 double observation_rms( const OBSERVE FAR *obs);            /* elem_out.cpp */
 double find_epoch_shown( const OBSERVE *obs, const int n_obs); /* elem_out */
 double evaluate_initial_orbit( const OBSERVE FAR *obs,      /* orb_func.c */
-                              const int n_obs, const double *orbit);
+               const int n_obs, const double *orbit, const double epoch);
 double diameter_from_abs_mag( const double abs_mag,      /* ephem0.cpp */
                                      const double optical_albedo);
 char **load_file_into_memory( const char *filename, size_t *n_lines,
                         const bool fail_if_not_found);      /* mpc_obs.cpp */
-const char *get_find_orb_text( const int index);      /* elem_out.cpp */
 int set_language( const int language);                      /* elem_out.cpp */
 void get_find_orb_text_filename( char *filename);     /* elem_out.cpp */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
 static int names_compare( const char *name1, const char *name2);
 static int get_uncertainty( const char *key, char *obuff, const bool in_km);
+static int obj_desig_to_perturber( const char *packed_desig);
 char *iso_time( char *buff, const double jd, const int precision); /* elem_out.cpp */
 int compute_canned_object_state_vect( double *loc, const char *mpc_code,
                      const double jd);                /* elem_out.cpp */
@@ -147,17 +150,31 @@ int get_planet_posn_vel( const double jd, const int planet_no,
 void compute_variant_orbit( double *variant, const double *ref_orbit,
                      const double n_sigmas);       /* orb_func.cpp */
 char *make_config_dir_name( char *oname, const char *iname);  /* miscell.cpp */
+int earth_lunar_posn( const double jd, double FAR *earth_loc, double FAR *lunar_loc);
+double vect_diff2( const double *a, const double *b);
 int get_residual_data( const OBSERVE *obs, double *xresid, double *yresid);
 int put_elements_into_sof( char *obuff, const char *templat,
          const ELEMENTS *elem, const double *nongravs,
          const int n_obs, const OBSERVE *obs);                /* elem_ou2.cpp */
+int qsort_strcmp( const void *a, const void *b, void *ignored_context);
 uint64_t parse_bit_string( const char *istr);                /* miscell.cpp */
-const char *write_bit_string( char *ibuff, const uint64_t bits);
+const char *write_bit_string( char *ibuff, const uint64_t bits,
+                                          const size_t max_bitstring_len);
+int save_ephemeris_settings( const ephem_option_t ephemeris_output_options,
+      const int n_steps, const char *obscode, const char *step_size,
+      const char *ephem_start, const char *config);      /* elem_out.cpp */
+int load_ephemeris_settings( ephem_option_t *ephemeris_output_options,
+      int *n_steps, char *obscode, char *step_size, char *ephem_start,
+      const char *config);                               /* elem_out.cpp */
+char *default_config_dir_name( char *oname, const char *iname);  /* miscell.c */
 double generate_mc_variant_from_covariance( double *var_orbit,
                                     const double *orbit);    /* orb_func.c */
 void rotate_state_vector_to_current_frame( double *state_vect,
                   const double epoch_shown, const int planet_orbiting,
                   char *body_frame_note);               /* elem_out.cpp */
+void *bsearch_ext_r( const void *key, const void *base0, size_t nmemb,
+      const size_t size, int (*compar)(const void *, const void *, void *),
+      void *arg, bool *found);                           /* shellsor.cpp */
 
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #ifdef __GNUC__
@@ -165,9 +182,9 @@ int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #endif
 ;
 
-/* Old MSVCs and OpenWATCOM lack erf() and many other math functions: */
+/* erf() and many other math functions were added in C++11. */
 
-#if defined( _MSC_VER) && (_MSC_VER < 1800) || defined( __WATCOMC__)
+#if( __cplusplus < 201103L)
 double erf( double x);     /* orb_fun2.cpp */
 #endif
 
@@ -194,12 +211,15 @@ char *fgets_trimmed( char *buff, size_t max_bytes, FILE *ifile)
 void get_first_and_last_included_obs( const OBSERVE *obs,
               const int n_obs, int *first, int *last)       /* elem_out.c */
 {
+   int i = 0;
+
+   while( i < n_obs - 1 && !obs[i].is_included)
+      i++;
+
    if( first)
-      for( *first = 0; *first < n_obs - 1 && !obs[*first].is_included;
-                                    (*first)++)
-         ;
+      *first = i;
    if( last)
-      for( *last = n_obs - 1; *last && !obs[*last].is_included; (*last)--)
+      for( *last = n_obs - 1; *last > i && !obs[*last].is_included; (*last)--)
          ;
 }
 
@@ -385,7 +405,9 @@ const char *get_find_orb_text( const int index)
    for( i = 0; default_text[i]; i++)
       if( atoi( default_text[i]) == index)
          return( default_text[i] + 8);
-   assert( 1);             /* i.e.,  should never get here */
+   debug_printf( "Requested index %d in language %c not found\n",
+                     index, findorb_language);
+   assert( 0);             /* i.e.,  should never get here */
    return( NULL);
 }
 
@@ -399,16 +421,17 @@ static void observation_summary_data( char *obuff, const OBSERVE FAR *obs,
                               const int n_obs, const int options)
 {
    int i, n_included, first_idx, last_idx;
+   size_t obuff_size = 80;
 
    get_first_and_last_included_obs( obs, n_obs, &first_idx, &last_idx);
    for( i = n_included = 0; i < n_obs; i++)
       n_included += obs[i].is_included;
    if( options == -1)      /* 'guide.txt' bare-bones format */
-      sprintf( obuff, "%d of %d", n_included, n_obs);
+      snprintf_err( obuff, obuff_size, "%d of %d", n_included, n_obs);
    else if( (options & ELEM_OUT_ALTERNATIVE_FORMAT) && n_included != n_obs)
-      sprintf( obuff, get_find_orb_text( 15), n_included, n_obs);
+      snprintf_err( obuff, obuff_size, get_find_orb_text( 15), n_included, n_obs);
    else
-      sprintf( obuff, get_find_orb_text( 16), n_included);
+      snprintf_err( obuff, obuff_size, get_find_orb_text( 16), n_included);
    if( options != -1 && n_included)
       {
       const double rms = (options & ELEM_OUT_NORMALIZED_MEAN_RESID) ?
@@ -416,8 +439,9 @@ static void observation_summary_data( char *obuff, const OBSERVE FAR *obs,
                   compute_rms( obs, n_obs);
       char rms_buff[24];
       const char *rms_format = "%.2f";
+      const char *extended = get_environment_ptr( "EXTENDED_RESID");
 
-      strcat( obuff, " ");
+      strlcat_err( obuff, " ", obuff_size);
       obuff += strlen( obuff);
       make_date_range_text( obuff, obs[first_idx].jd, obs[last_idx].jd);
       obuff += strlen( obuff);
@@ -428,8 +452,11 @@ static void observation_summary_data( char *obuff, const OBSERVE FAR *obs,
          strlcat_err( rms_buff, " sigmas", sizeof( rms_buff));
       else
          text_search_and_replace( rms_buff, ".", "\".");
-      sprintf( obuff, get_find_orb_text( 17), rms_buff);
-      }                                 /* "; mean residual %s." */
+      snprintf_err( obuff, obuff_size, get_find_orb_text( 17), rms_buff);
+      if( *extended)
+         snprintf_append( obuff, obuff_size, "/%.2f sigmas",
+                     compute_weighted_rms( obs, n_obs, NULL));
+      }
 }
 
 double centralize_ang( double ang)
@@ -455,15 +482,6 @@ static void packed_desig_minus_spaces( char *obuff, const char *ibuff)
    *obuff = '\0';
 }
 
-double current_jd( void)
-{
-   static const double jan_1970 = 2440587.5;
-   const double jd = jan_1970 +
-                  (double)nanoseconds_since_1970( ) * 1e-9 / seconds_per_day;
-
-   return( jd);
-}
-
 /* For some time,  I only had second-hand info on MPC's definition of
 an 'opposition'.  It sounded as if their definition was that 17 half-months
 had elapsed between consecutive observations,  with the length varying
@@ -510,7 +528,6 @@ static int elements_in_mpcorb_format( char *buff, const char *packed_desig,
                 const char *full_desig, const ELEMENTS *elem,
                 const OBSERVE FAR *obs, const int n_obs)   /* orb_func.c */
 {
-   extern unsigned perturbers;
    int month, day, i, first_idx, last_idx, n_included_obs = 0;
    long year;
    const double rms_err = compute_rms( obs, n_obs);
@@ -519,65 +536,81 @@ static int elements_in_mpcorb_format( char *buff, const char *packed_desig,
             /* signifying if the object is in any of various classes such  */
             /* as Aten,  scattered-disk object,  PHA,  Jupiter Trojan,     */
             /*  etc.  None of those flags are set yet.                     */
-   const int n_oppositions = 1;
-            /* The above needs some work.  Problem is,  what constitutes   */
-            /* an "opposition" for an NEO?  (It's more clearcut for MBOs.) */
-            /* For the nonce,  we'll just say "one opposition".            */
    double arc_length;
    char packed_desig2[40];
+   const size_t mpcorb_line_len = 203;
+   double abs_mag = elem->abs_mag;
 
    packed_desig_minus_spaces( packed_desig2, packed_desig);
-   sprintf( buff, "%-8s%5.2f  %4.2f ", packed_desig2, elem->abs_mag,
+   if( 12 == strlen( packed_desig2))  /* fix cases where number &  */
+      packed_desig2[5] = '\0';        /* provisional ID are both set; */
+   packed_desig2[8] = '\0';           /* prevent overrun otherwise */
+   if( abs_mag > 99.9)
+      abs_mag = 99.9;
+   if( abs_mag < -9.9)
+      abs_mag = -9.9;
+   snprintf_err( buff, mpcorb_line_len, "%-8s%5.2f %5.2f ", packed_desig2, abs_mag,
                            asteroid_magnitude_slope_param);
    day = (int)( decimal_day_to_dmy( elem->epoch, &year,
                               &month, CALENDAR_JULIAN_GREGORIAN) + .0001);
-   sprintf( buff + 20, "%c%02ld%X%c",
-                  int_to_mutant_hex_char( year / 100),
-                  year % 100L, month,
+   assert( 20 == strlen( buff));
+   snprintf_append( buff, mpcorb_line_len, "%c%02ld%X%c",
+                  (year >= 0 && year < 6200) ? int_to_mutant_hex_char( year / 100) : '~',
+                  abs( year) % 100L, month,
                   int_to_mutant_hex_char( day));
-   sprintf( buff + 25, "%10.5f%11.5f%11.5f%11.5f%11.7f",
+   assert( 25 == strlen( buff));
+   snprintf_append( buff, mpcorb_line_len, "%10.5f%11.5f%11.5f%11.5f%11.7f",
            centralize_ang( elem->mean_anomaly) * 180. / PI,
            centralize_ang( elem->arg_per) * 180. / PI,
            centralize_ang( elem->asc_node) * 180. / PI,
            centralize_ang( elem->incl) * 180. / PI,
            elem->ecc);
-   sprintf( buff + 79, "%12.8f%12.7f",
-            (180 / PI) / elem->t0,        /* n */
-            elem->major_axis);
+   assert( 79 == strlen( buff));
+   snprintf_append( buff, mpcorb_line_len, " %11.8f",
+               (180. / PI) / elem->t0);   /* n = mean motion in deg/day */
+   buff[91] = '\0';
+   snprintf_append( buff, mpcorb_line_len, " %11.7f", elem->major_axis);
+   buff[103] = '\0';
    for( i = 0; i < n_obs; i++)
       if( obs[i].is_included)
          n_included_obs++;
    day = (int)( decimal_day_to_dmy( current_jd( ),
                          &year, &month, CALENDAR_JULIAN_GREGORIAN) + .0001);
-   sprintf( buff + 103,
-      "    FO %02d%02d%02d  %4d  %2d ****-**** ****         Find_Orb   %04x",
+   snprintf_append( buff, mpcorb_line_len,
+      "    FO %02d%02d%02d %5d %3d ****-**** ****         Find_Orb   %04x",
                   (int)( year % 100), month, (int)day,
-                  n_included_obs, n_oppositions, hex_flags);
+                  n_included_obs, _n_oppositions( obs, n_obs), hex_flags);
    get_first_and_last_included_obs( obs, n_obs, &first_idx, &last_idx);
    arc_length = obs[last_idx].jd - obs[first_idx].jd;
+   assert( strlen( buff) == 165);
    if( arc_length < 99. / seconds_per_day)
-      sprintf( buff + 127, "%4.1f sec ", arc_length * seconds_per_day);
+      snprintf_err( buff + 127, 10, "%4.1f sec ", arc_length * seconds_per_day);
    else if( arc_length < 99. / minutes_per_day)
-      sprintf( buff + 127, "%4.1f min ", arc_length * minutes_per_day);
+      snprintf_err( buff + 127, 10, "%4.1f min ", arc_length * minutes_per_day);
    else if( arc_length < 2.)
-      sprintf( buff + 127, "%4.1f hrs ", arc_length * hours_per_day);
+      snprintf_err( buff + 127, 10, "%4.1f hrs ", arc_length * hours_per_day);
    else if( arc_length < 600.)
-      sprintf( buff + 127, "%4d days", (int)arc_length + 1);
+      snprintf_err( buff + 127, 10, "%4d days", (int)arc_length + 1);
    else
-      sprintf( buff + 127, "%4d-%4d",
+      snprintf_err( buff + 127, mpcorb_line_len, "%4d-%4d",
                 (int)JD_TO_YEAR( obs[first_idx].jd),
                 (int)JD_TO_YEAR( obs[last_idx].jd));
    buff[136] = ' ';
-   sprintf( buff + 165, " %-30s", full_desig);
+   assert( 165 == strlen( buff));
+   if( strlen( full_desig) > 28)
+      strlcat( buff, full_desig, 195);
+   else
+      snprintf_append( buff, mpcorb_line_len, " %-28s", full_desig);
    day = (int)( decimal_day_to_dmy( obs[last_idx].jd, &year,
                        &month, CALENDAR_JULIAN_GREGORIAN) + .0001);
-   sprintf( buff + 194, "%04ld%02d%02d", year, month, day);
+   assert( 194 == strlen( buff));
+   snprintf_append( buff, mpcorb_line_len, "%04ld%02d%02d", year, month, day);
    if( rms_err < 9.9)
-      sprintf( buff + 137, "%4.2f", rms_err);
+      snprintf_err( buff + 137, 5, "%4.2f", rms_err);
    else if( rms_err < 99.9)
-      sprintf( buff + 137, "%4.1f", rms_err);
+      snprintf_err( buff + 137, 5, "%4.1f", rms_err);
    else if( rms_err < 9999.)
-      sprintf( buff + 137, "%4.0f", rms_err);
+      snprintf_err( buff + 137, 5, "%4.0f", rms_err);
    buff[141] = ' ';
    if( (perturbers & 0x1fe) == 0x1fe)
       {    /* we have Mercury through Neptune,  at least */
@@ -661,7 +694,7 @@ static int make_linkage_json( const int n_obs, const OBSERVE *obs, const ELEMENT
    ifile = fopen_ext( "link_hdr.json", "cr");
    if( !ifile)   /* no user-modified header; fall back to default hdr */
       ifile = fopen_ext( "link_def.json", "fcr");
-   ofile = fopen_ext( (elem->central_obj == 3) ? "artsat.json" : "linkage.json", "fcw");
+   ofile = fopen_ext( (elem->central_obj == 3) ? "artsat.json" : "linkage.json", "tfcw");
    while( fgets( buff, sizeof( buff), ifile))
       if( *buff != '#')
          {
@@ -797,7 +830,7 @@ static char *object_name( char *buff, const int obj_index)
    else if( obj_index > 0 && obj_index < 11) /* nine planets & moon */
       strcpy( buff, get_find_orb_text( 99107 + obj_index));
    else
-      sprintf( buff, "Object_%d\n", obj_index);
+      snprintf_err( buff, 12, "Object_%d", obj_index);
    return( buff);
 }
 
@@ -886,7 +919,7 @@ static int elements_in_json_format( FILE *ofile, const ELEMENTS *elem,
             {
             const char *fields[] = { "name", "prov_desig", "disc_date", "disc_site",
                            "disc_ref", "discover" };
-            const int offsets[] = { 9, 29, 41, 53, 72, 78 };
+            const int offsets[] = { 12, 32, 44, 56, 75, 81 };
             char *tptr = (char *)find_nth_utf8_char( text, offsets[i]);
 
             remove_trailing_cr_lf( tptr);
@@ -1125,35 +1158,76 @@ static int elements_in_json_format( FILE *ofile, const ELEMENTS *elem,
    return( 0);
 }
 
+/* First stab at writing out orbital elements in a form that can be
+readily imported to JPL Horizon's "plain text" format.  That format
+is noted as preliminary/in progress/unreliable,  so this may change. */
+
+static int write_horizons_elems( const char *filename, const ELEMENTS *elem, const double *orbit)
+{
+   FILE *ofile = fopen( filename, "wb");
+   extern int force_model;
+   int i;
+
+   assert( ofile);
+   fprintf( ofile, "Object: From_Find_Orb\n");
+   fprintf( ofile, "H= %.3f    G= %.2f\n", elem->abs_mag, elem->slope_param);
+   fprintf( ofile, "EPOCH= %.3f\n", elem->epoch);
+   fprintf( ofile, "EC= %.11f     QR= %.11f   TP= %.8f\n",
+                        elem->ecc, elem->q, elem->perih_time);
+   fprintf( ofile, "OM= %.7f     W= %.7f    IN= %.7f\n",
+                     elem->asc_node * 180. / PI,
+                     elem->arg_per * 180. / PI,
+                     elem->incl * 180. / PI);
+   for( i = 0; i < (force_model & 0xf); i++)
+      fprintf( ofile, "A%d= %.6e    ", i + 1, orbit[i + 6]);
+   fclose( ofile);
+   return 0;
+}
+
 static int elements_in_guide_format( char *buff, const ELEMENTS *elem,
                      const char *obj_name, const OBSERVE *obs,
                      const unsigned n_obs)
 {
-   int month;
-   double day;
+   int month, q_prec = 10, e_prec = 8;
+   double day, tval;
    long year;
+   const size_t guide_line_len = 170;
 
+   if( elem->q > 1e+10 || elem->ecc > 1e+8)
+      return( -1);            /* can't format it;  bogus elems */
    day = decimal_day_to_dmy( elem->perih_time, &year, &month,
                                               CALENDAR_JULIAN_GREGORIAN);
             /*      name day  mon yr MA      q      e */
-   sprintf( buff, "%-43s%8.5f%3d%5ld Find_Orb %14.7f%12.7f%11.6f%12.6f%12.6f",
-            obj_name, day, month, year,
-            elem->q, elem->ecc,
+   tval = elem->q;
+   while( tval > 9.999)
+      {
+      tval /= 10;
+      q_prec--;
+      }
+   tval = elem->ecc;
+   while( tval > 9.999)
+      {
+      tval /= 10;
+      e_prec--;
+      assert( e_prec);
+      }
+   strlcpy( buff, obj_name, 43);
+   memset( buff + strlen( buff), ' ', 43);
+   snprintf_err( buff + 43, guide_line_len,
+            "%8.5f%3d%5ld Find_Orb    %12.*f %10.*f%11.6f %11.6f %11.6f",
+            day, month, year,
+            q_prec, elem->q, e_prec, elem->ecc,
             centralize_ang( elem->incl) * 180. / PI,
             centralize_ang( elem->arg_per) * 180. / PI,
             centralize_ang( elem->asc_node) * 180. / PI);
-   if( elem->q < .01)
-      {
-      sprintf( buff + 71, "%12.10f", elem->q);
-      buff[71] = buff[83] = ' ';
-      }
-   sprintf( buff + strlen( buff), " %9.1f%5.1f%5.1f %c",
+   assert( strlen( buff) == 130);
+   snprintf_append( buff, guide_line_len,  " %9.1f%5.1f%5.1f %c",
             elem->epoch, elem->abs_mag,
             elem->slope_param * (elem->is_asteroid ? 1. : 0.4),
             (elem->is_asteroid ? 'A' : ' '));
    if( elem->central_obj)
-      sprintf( buff + strlen( buff), "  Center: %d", elem->central_obj);
-   strcat( buff, "  ");
+      snprintf_append( buff, guide_line_len, "  Center: %d", elem->central_obj);
+   strlcat_err( buff, "  ", guide_line_len);
    observation_summary_data( buff + strlen( buff), obs, n_obs, -1);
    return( 0);
 }
@@ -1360,14 +1434,14 @@ static int add_sof_to_file( const char *filename,
       obj_name++;
    get_file_name( output_filename, filename);
    forking = strcmp( output_filename, filename);
-   fp = fopen_ext( output_filename, "cr+b");
+   fp = fopen_ext( output_filename, (forking ? "tr+b" : "cr+b"));
    if( !fp && fallback_filename)
       {
       fp = fopen_ext( fallback_filename, "fcr+b");
       if( !fgets( templat, sizeof( templat), fp))
          assert( 1);          /* should never happen */
       fclose( fp);
-      fp = fopen_ext( output_filename, "fcw+b");
+      fp = fopen_ext( output_filename, (forking ? "tfw+b" : "fcw+b"));
       fputs( templat, fp);
       }
    assert( fp);
@@ -1439,16 +1513,18 @@ void get_periapsis_loc( double *ecliptic_lon, double *ecliptic_lat,
 }
 
 static void _store_extra_orbit_info( const char *packed_id,
-               const unsigned perturbers, const int n_extra_params,
+               const int n_extra_params,
                const double *solar_pressure, const char *constraints)
 {
    extern int force_model;
    size_t n_lines;
-   char **lines = load_file_into_memory( _extras_filename, &n_lines, true);
+   char **lines = load_file_into_memory( _extras_filename, &n_lines, false);
    FILE *ofile;
    int i, line_no = -1;
    char buff[200];
 
+   if( !lines)
+      lines = load_file_into_memory( _default_extras_filename, &n_lines, true);
    assert( strlen( packed_id) == 12);
    assert( (force_model && n_extra_params) || (!force_model && !n_extra_params));
    for( i = 0; i < (int)n_lines; i++)
@@ -1462,7 +1538,9 @@ static void _store_extra_orbit_info( const char *packed_id,
       if( force_model)
          snprintf_append( buff, sizeof( buff), " model=%x", force_model);
       for( i = 0; i < n_extra_params; i++)
-         snprintf_append( buff, sizeof( buff), " A%d=%e", i + 1, solar_pressure[i]);
+         snprintf_append( buff, sizeof( buff),
+                 (n_extra_params <= 3 ? " A%d=%e" : " A%d=%f"),
+                 i + 1, solar_pressure[i]);
       if( *constraints)
          snprintf_append( buff, sizeof( buff), " Constraint=%s", constraints);
       if( line_no >= 0 && !strcmp( buff, lines[line_no]))
@@ -1490,30 +1568,53 @@ static void _store_extra_orbit_info( const char *packed_id,
    fclose( ofile);
 }
 
+/* Packed designations may be (frequently are) misaligned.  This will
+compare them 'accurately' even if the alignments are different,  ignoring
+the different numbers of leading spaces. */
+
+static int _compare_misaligned_packed_desigs( const char *desig1,
+                  const char *desig2)
+{
+   while( *desig1 == ' ')
+      desig1++;
+   while( *desig2 == ' ')
+      desig2++;
+   while( *desig1 && *desig1 != ' ' && *desig1 == *desig2)
+      {
+      desig1++;
+      desig2++;
+      }
+   if( !*desig1 || *desig1 == ' ')
+      return( 0);
+   return( (int)*desig1 - (int)*desig2);
+}
+
 static int _get_extra_orbit_info( const char *packed_id,
-                unsigned *perturbers, int *n_extra_params,
+                int *n_extra_params,
                 double *solar_pressure, char *constraints)
 {
    extern int force_model;
    size_t n_lines;
-   char **lines = load_file_into_memory( _extras_filename, &n_lines, true);
-   int i, j, rval = 0;
+   char **lines = load_file_into_memory( _extras_filename, &n_lines, false);
+   int rval = 0;
 
+   if( !lines)
+      lines = load_file_into_memory( _default_extras_filename, &n_lines, true);
    assert( strlen( packed_id) == 12);
-   for( i = 0; i < (int)n_lines; i++)
-      if( !memcmp( lines[i], packed_id, 12))
+   for( size_t i = 0; i < n_lines; i++)
+      if( !_compare_misaligned_packed_desigs( lines[i], packed_id))
          {
          const char *tptr;
 
          if( (tptr = strstr( lines[i], " p=")) != NULL)
-            sscanf( tptr + 3, "%x", perturbers);
+            sscanf( tptr + 3, "%x", &perturbers);
          if( (tptr = strstr( lines[i], " model=")) != NULL)
             sscanf( tptr + 7, "%x", (unsigned *)&force_model);
-         for( j = 0; j < 5; j++)
+         for( unsigned j = 0; j < 5; j++)
             {
             char tbuff[6];
 
-            snprintf( tbuff, sizeof( tbuff), " A%d=", j + 1);
+            snprintf( tbuff, sizeof( tbuff), " A%u=", j + 1);
             if( (tptr = strstr( lines[i], tbuff)) != NULL)
                {
                sscanf( tptr + 4, "%lf", solar_pressure + j);
@@ -1538,6 +1639,36 @@ static bool _include_comment( const char *keyval)
    return( !strstr( get_environment_ptr( "COMMENT_SHUTOFF"), keyval));
 }
 
+
+static void format_value_with_sigma( char *obuff, const double value, const char *sigma_text)
+{
+   const char *eptr = strchr( sigma_text, 'e');
+
+   if( !eptr)
+      {
+      put_double_in_buff( obuff, value);
+      strlcat_err( obuff, " +/- ", 80);
+      strlcat_err( obuff, sigma_text, 80);
+      }
+   else
+      {
+      const char *decimal_ptr = strchr( sigma_text, '.');
+      const int exponent = atoi( eptr + 1);
+      int places = 0;
+      char format[20], output_value[30];
+
+      if( decimal_ptr)
+         places = (int)( eptr - decimal_ptr) - 1;
+      assert( places >= 0 && places < 10);
+      strlcpy_error( format, "(%.?f +/- %s)e%s");
+      format[3] = '0' + places;
+      memcpy( output_value, sigma_text, eptr - sigma_text);
+      output_value[eptr - sigma_text] = '\0';
+      snprintf_err( obuff, 80, format, value * pow( 0.1, (double)exponent),
+                                 output_value, eptr + 1);
+      }
+}
+
 /* From an e-mail from Alan Harris:
 
    "...the formula for encounter velocity (in FORTRAN), for a circular planet
@@ -1591,6 +1722,7 @@ void rotate_state_vector_to_current_frame( double *state_vect,
 {
    int elements_frame = atoi( get_environment_ptr( "ELEMENTS_FRAME"));
    const char *frame_str = NULL;
+   const size_t body_frame_note_len = 30;
 
             /* By default,  we use J2000 equatorial elements for geocentric
             elements,  J2000 ecliptic for everybody else. */
@@ -1613,7 +1745,7 @@ void rotate_state_vector_to_current_frame( double *state_vect,
          if( !year)
              year = JD_TO_YEAR( epoch_shown);
          if( body_frame_note)
-            sprintf( body_frame_note, "(%s)", elem_epoch);
+            snprintf_err( body_frame_note, body_frame_note_len, "(%s)", elem_epoch);
          setup_ecliptic_precession( precession_matrix, 2000., year);
          precess_vector( precession_matrix, state_vect, state_vect);
          precess_vector( precession_matrix, state_vect + 3, state_vect + 3);
@@ -1633,7 +1765,7 @@ void rotate_state_vector_to_current_frame( double *state_vect,
       frame_str = "(body frame)";
       }
    if( body_frame_note && frame_str)
-      strcpy( body_frame_note, frame_str);
+      strlcpy_err( body_frame_note, frame_str, body_frame_note_len);
 }
 
 /* Used to provide a link to Tony Dunn's Orbit Simulator when making
@@ -1731,11 +1863,11 @@ periapsis uncertainty.  And we retain the "from x to y" line.
 matches the number of digits in the quantity itself.
 
    The program is theoretically capable of computing MOIDs relative to
-N_MOIDS objects (currently 14:  eight planets,  six asteroids). However,
-N_MOIDS_TO_SHOW = 8 at present (we only show planetary MOIDs.) */
+N_MOIDS objects (currently 14:  eight planets,  six asteroids).  We
+default to 8 (planetary MOIDs only),  but can add six asteroid MOIDS
+by setting N_MOIDS=14 in 'environ.dat'.  */
 
 #define N_MOIDS           14
-#define N_MOIDS_TO_SHOW    8
 
 double comet_total_magnitude = 0.;          /* a.k.a. "M1" */
 double comet_nuclear_magnitude = 0.;        /* a.k.a. "M2" */
@@ -1751,7 +1883,7 @@ int write_out_elements_to_file( const double *orbit,
             const int precision, const int monte_carlo,
             const int options)
 {
-   char object_name[80], buff[260], more_moids[80];
+   char object_name[80], buff[320], more_moids[80];
    const char *file_permits = (append_elements_to_element_file ? "tfca" : "tfcw+");
    extern const char *elements_filename;
    FILE *ofile = fopen_ext( get_file_name( buff, elements_filename), file_permits);
@@ -1763,9 +1895,8 @@ int write_out_elements_to_file( const double *orbit,
    int n_more_moids = 0;
    int output_format = (precision | SHOWELEM_PERIH_TIME_MASK);
    extern int n_orbit_params;
-   extern unsigned perturbers;
    int reference_shown = 0;
-   double moids[N_MOIDS + 1];
+   double moids[N_MOIDS + 3];
    double j2000_ecliptic_rel_orbit[MAX_N_PARAMS];
    double barbee_style_delta_v = 0.;   /* see 'moid4.cpp' */
    const char *monte_carlo_permits;
@@ -1774,9 +1905,15 @@ int write_out_elements_to_file( const double *orbit,
    int geocentric_score = -1;
    char body_frame_note[30];
    bool body_frame_note_shown = false;
-   int showing_sigmas = available_sigmas;
+   int showing_sigmas, saved_available_sigmas = available_sigmas;
    const unsigned orbit_summary_options = atoi( get_environment_ptr( "ORBIT_SUMMARY_OPTIONS"));
    extern int is_interstellar;         /* orb_func.cpp */
+   const size_t tbuff_size = 80 * 9;
+   const char *horizons_elems = get_environment_ptr( "HORIZONS_ELEMS");
+   static const char *moid_text[N_MOIDS] = { "Earth MOID", "Ju",
+                           "Ve", "Me", "Ma", "Sa", "Ur", "Ne",
+                           "Ce", "Pa", "Vt", "(29)", "(16)", "(15)" };
+
 
    setvbuf( ofile, NULL, _IONBF, 0);
    if( default_comet_magnitude_type == 'N')
@@ -1797,35 +1934,31 @@ int write_out_elements_to_file( const double *orbit,
       }
    memcpy( orbit2, orbit, n_orbit_params * sizeof( double));
    integrate_orbit( orbit2, curr_epoch, epoch_shown);
-   if( forced_central_body != ORBIT_CENTER_AUTO)
-      {
-      planet_orbiting = forced_central_body;
-      get_relative_vector( epoch_shown, orbit2, rel_orbit, planet_orbiting);
-      }
-   else
-      planet_orbiting = find_best_fit_planet( epoch_shown, orbit2, rel_orbit);
-
+   planet_orbiting = find_central_object( obs, epoch_shown, orbit2, rel_orbit);
    memcpy( j2000_ecliptic_rel_orbit, rel_orbit, n_orbit_params * sizeof( double));
    rotate_state_vector_to_current_frame( rel_orbit, epoch_shown, planet_orbiting,
                        body_frame_note);
 
-   if( !(options & ELEM_OUT_ALTERNATIVE_FORMAT))
-      showing_sigmas = 0;
-   if( showing_sigmas == COVARIANCE_AVAILABLE)
+   if( available_sigmas == COVARIANCE_AVAILABLE)
       {
       extern int available_sigmas_hash;
 
       if( available_sigmas_hash != compute_available_sigmas_hash( obs, n_obs,
                   epoch_shown, perturbers, planet_orbiting))
-         showing_sigmas = 0;
+         available_sigmas = 0;
       }
+   if( !(options & ELEM_OUT_ALTERNATIVE_FORMAT))
+      showing_sigmas = 0;
+   else
+      showing_sigmas = available_sigmas;
 
    elem.central_obj = planet_orbiting;
    elem.gm = get_planet_mass( planet_orbiting);
    elem.epoch = epoch_shown;
    calc_classical_elements( &elem, rel_orbit, epoch_shown, 1);
    if( elem.ecc < .9)
-      sprintf( orbit_summary_text, "a=%.3f, ", elem.major_axis);
+      snprintf_err( orbit_summary_text, sizeof( orbit_summary_text),
+                                   "a=%.3f, ", elem.major_axis);
    else
       *orbit_summary_text = '\0';
    if( elem.ecc >= .9 || (orbit_summary_options & ORBIT_SUMMARY_Q))
@@ -1866,7 +1999,7 @@ int write_out_elements_to_file( const double *orbit,
    if( saving_elements_for_reuse && available_sigmas == COVARIANCE_AVAILABLE)
       {
       add_sof_to_file( "orbits.sof", &elem, orbit + 6, n_obs, obs, "orbitdef.sof");
-      _store_extra_orbit_info( obs->packed_id, perturbers, n_orbit_params - 6,
+      _store_extra_orbit_info( obs->packed_id, n_orbit_params - 6,
                      orbit + 6, constraints);
       }
 /* if( showing_sigmas == COVARIANCE_AVAILABLE)
@@ -1887,23 +2020,20 @@ int write_out_elements_to_file( const double *orbit,
    helio_elem.central_obj = 0;
    helio_elem.gm = SOLAR_GM;
    calc_classical_elements( &helio_elem, orbit2, epoch_shown, 1);
-   tbuff = (char *)malloc( 80 * 9);
-   n_lines = elements_in_mpc_format( tbuff, &elem, object_name,
+   tbuff = (char *)malloc( tbuff_size);
+   n_lines = elements_in_mpc_format( tbuff, tbuff_size, &elem, object_name,
                is_cometary( constraints) && fabs( elem.ecc - 1.) < 1.e-6,
                output_format);
    fprintf( ofile, "%s\n", tbuff);
    tptr = tbuff + strlen( tbuff) + 1;
    *more_moids = '\0';
-   for( i = 0; i < 9; i++)
+   for( i = 0; (size_t)i < sizeof( moids) / sizeof( moids[0]); i++)
       moids[i] = 0.;
    for( i = 1; i < n_lines && *tptr; i++)
       {
       char *tt_ptr;
       char sigma_buff[80];
       extern double uncertainty_parameter;
-             /* "Solar radiation pressure at 1 AU",  in             */
-             /* kg*AU^3 / (m^2*d^2),  from a private communication  */
-             /* from Steve Chesley; see orb_func.cpp for details    */
 
       strlcpy_error( sigma_buff, "+/- ");
       strlcpy_error( buff, tptr);
@@ -1919,18 +2049,18 @@ int write_out_elements_to_file( const double *orbit,
 
                if( mass)
                   {
-                  sprintf( tt_ptr, "; %s=%.4g", constraints, *mass);
+                  snprintf_err( tt_ptr, 80, "; %s=%.4g", constraints, *mass);
                   consider_replacing( buff, constraints, "Sigma_mass:");
                   clobber_leading_zeroes_in_exponent( buff);
                   }
                else
-                  sprintf( tt_ptr, "; bad '%s'", constraints);
+                  snprintf_err( tt_ptr, 80, "; bad '%s'", constraints);
                }
             else
-               sprintf( tt_ptr, ";  Constraint: %s", constraints);
+               snprintf_err( tt_ptr, 80, ";  Constraint: %s", constraints);
             }
          else if( n_monte_carlo_impactors && monte_carlo)
-            sprintf( tt_ptr, ";  %.2f%% impact (%d/%d)",
+            snprintf_err( tt_ptr, 80, ";  %.2f%% impact (%d/%d)",
                 100. * (double)n_monte_carlo_impactors /
                        (double)monte_carlo_object_count,
                        n_monte_carlo_impactors, monte_carlo_object_count);
@@ -1943,7 +2073,6 @@ int write_out_elements_to_file( const double *orbit,
 
          if( (n_orbit_params >= 8 && n_orbit_params <= 10) || force_model == FORCE_MODEL_YARKO_A2)
             {
-            char tbuff0[80], sig_name[20];
             int j = 0;
 
             if( !strcmp( constraints, "A=0") || !strcmp( constraints, "A1=0"))
@@ -1952,38 +2081,61 @@ int write_out_elements_to_file( const double *orbit,
             tt_ptr += strlen( tt_ptr);
             for( ; j < n_orbit_params - 6; j++)
                {
+               char addenda[80];
+               char tbuff0[80], sig_name[20];
+
                put_double_in_buff( tbuff0, orbit[j + 6]);
                text_search_and_replace( tbuff0, " ", "");
                strlcat_error( tbuff0, " ");
-               sprintf( sig_name, "Sigma_A%d:", j + 1);
+               snprintf_err( sig_name, sizeof( sig_name), "Sigma_A%d:", j + 1);
                if( showing_sigmas)
                   if( !get_uncertainty( sig_name, sigma_buff + 4, false))
-                     strlcat_error( tbuff0, sigma_buff);
-/*             snprintf_append( tt_ptr, 180, "A%d: %s", j + 1, tbuff0); */
-               if( j == 3)
-                  snprintf_append( buff, sizeof( buff), "DT: %s", tbuff0);
+                     format_value_with_sigma( tbuff0, orbit[j + 6], sigma_buff + 4);
+               if( force_model == FORCE_MODEL_DELTA_V)
+                  {
+                  size_t k;
+
+                  strlcpy_error( addenda, "T0: ");
+                  if( j < 3)              /* dx, dy, or dz */
+                     {
+                     addenda[0] = 'd';
+                     addenda[1] = 'x' + j;
+                     }
+                  else
+                     {
+                     full_ctime( tbuff0, orbit[9], CALENDAR_JULIAN_GREGORIAN
+                               | FULL_CTIME_YMD | FULL_CTIME_LEADING_ZEROES | FULL_CTIME_MILLIDAYS);
+                     snprintf_append( tbuff0, sizeof( tbuff0), " +/- %s", sigma_buff + 4);
+                     }
+                  strlcat_error( addenda, tbuff0);
+                  if( j == 2)
+                     strlcat_error( addenda, " m/s");
+                  for( k = 0; addenda[k]; k++)
+                     while( addenda[k] == ' ' && addenda[k + 1] == ' ')
+                        memmove( addenda + k, addenda + k + 1, strlen( addenda + k));
+                  }
+               else if( j == 3)
+                  snprintf_err( addenda, sizeof( addenda), "DT: %s", tbuff0);
                else
                   {
                   const int n_to_use = (force_model == FORCE_MODEL_YARKO_A2 ? 2 : j + 1);
 
-                  snprintf_append( buff, sizeof( buff), "A%d: %s", n_to_use, tbuff0);
+                  snprintf_err( addenda, sizeof( addenda), "A%d: %s", n_to_use, tbuff0);
                   if( j == n_orbit_params - 7 || j == 2)
                      {
-                     strcat( tt_ptr, " AU/day^2");
+                     strlcat_error( addenda, " AU/day^2");
                      if( is_inverse_square_force_model( ))
-                        strcat( tt_ptr, " [1/r^2]");
+                        strlcat_error( addenda, " [1/r^2]");
                      }
                   }
-               if( j < n_orbit_params - 7)
+               if( strlen( addenda) + strlen( tt_ptr) > 74)
                   {
-                  if( strlen( tt_ptr) > 50)
-                     {
-                     strcat( tt_ptr, "\n");
-                     tt_ptr += strlen( tt_ptr);
-                     }
-                  else
-                     strcat( tt_ptr, "   ");
+                  strlcat_err( tt_ptr, "\n", 79);
+                  tt_ptr += strlen( tt_ptr);
                   }
+               else if( *tt_ptr)
+                  strlcat_err( tt_ptr, "   ", 79);
+               strlcat_err( tt_ptr, addenda, 79);
                }
             }
          assert( strlen( buff) < sizeof( buff) - 1);
@@ -1992,47 +2144,64 @@ int write_out_elements_to_file( const double *orbit,
       else if( !memcmp( buff, "Epoch", 5))
          {
          int j;
-         const double SRP1AU = 2.3e-7;
+         int n_moids_to_show = atoi( get_environment_ptr( "N_MOIDS"));
 
+         if( !n_moids_to_show)      /* by default,  just show */
+            n_moids_to_show = 8;    /* planetary MOIDs */
          if( force_model == FORCE_MODEL_SRP)
             {
-            sprintf( tt_ptr, "; AMR %.5g",
+            snprintf_err( tt_ptr, 80, "; AMR %.5g",
                                  orbit[6] * SOLAR_GM / SRP1AU);
             if( showing_sigmas)
                consider_replacing( tt_ptr, "AMR", "Sigma_AMR:");
-            strcat( tt_ptr, " m^2/kg");
+            strlcat_err( tt_ptr, " m^2/kg", 80);
             }
-         if( !planet_orbiting)
-            for( j = 0; j < N_MOIDS_TO_SHOW; j++)
-               {
-               static const char moid_idx[N_MOIDS] = { 3, 5, 2, 1, 4, 6, 7, 8,
+         for( j = 0; j < n_moids_to_show; j++)
+            {
+            static const char moid_idx[N_MOIDS] = { 3, 5, 2, 1, 4, 6, 7, 8,
                                        10, 11, 12, 13, 14, 15 };
+            const int planet = moid_idx[j];
+
+            if( !planet_orbiting || planet_orbiting == planet)
+               {
                moid_data_t mdata;
                double moid, moid_limit = .1;
                ELEMENTS planet_elem;
                const int forced_moid =
                    (atoi( get_environment_ptr( "MOIDS")) >> j) & 1;
 
-               setup_planet_elem( &planet_elem, moid_idx[j],
+               setup_planet_elem( &planet_elem, planet,
                                 (epoch_shown - J2000) / 36525.);
                moid = find_moid_full( &planet_elem, &helio_elem, &mdata);
                if( !j)     /* only get Barbee speed for the earth */
-                  barbee_style_delta_v = mdata.barbee_speed * AU_IN_KM / seconds_per_day;
+                  {
+                  double lunar_loc[3], earth_loc[3], lunar_r, earth_r;
+                  double v2;
+
+                  earth_lunar_posn( epoch_shown, earth_loc, lunar_loc);
+                  lunar_r = sqrt( vect_diff2( orbit2, lunar_loc));
+                  earth_r = sqrt( vect_diff2( orbit2, earth_loc));
+                  v2 = mdata.barbee_speed * mdata.barbee_speed
+                                    - 2. * get_planet_mass( 3) / earth_r
+                                    - 2. * get_planet_mass( 10) / lunar_r;
+                  if( v2 > 0.)
+                     barbee_style_delta_v = sqrt( v2);
+                  else
+                     barbee_style_delta_v = -sqrt( -v2);
+                  barbee_style_delta_v *= AU_IN_KM / seconds_per_day;
+                  }
                if( j < 2)        /* Earth or Jupiter */
                   moid_limit = 1.;
                else if( j > 7)            /* asteroid */
                   moid_limit = .1;
                else if( j > 4)          /* Saturn,  Uranus,  Neptune */
                   moid_limit = 1.;
-               moids[(int)moid_idx[j]] = moid;
-               if( forced_moid || moid < moid_limit)
+               moids[planet] = moid;
+               if( !planet_orbiting && (forced_moid || moid < moid_limit))
                   {
                   char addendum[30];
-                  static const char *moid_text[N_MOIDS] = { "Earth MOID", "Ju",
-                           "Ve", "Me", "Ma", "Sa", "Ur", "Ne",
-                           "Ce", "Pa", "Vt", "(29)", "(16)", "(15)" };
-
-                  sprintf( addendum, "   %s: %.4f", moid_text[j], moid);
+                  snprintf_err( addendum, sizeof( addendum),
+                                 "   %s: %.4f", moid_text[j], moid);
                   if( strlen( addendum) + strlen( buff) < 79)
                      strlcat_error( buff, addendum);
                   else
@@ -2046,6 +2215,7 @@ int write_out_elements_to_file( const double *orbit,
                            sizeof( orbit_summary_text), " MOID %.3f", moid);
                   }
                }
+            }
          }
       else if( *more_moids)
          {
@@ -2062,18 +2232,17 @@ int write_out_elements_to_file( const double *orbit,
       if( !(options & ELEM_OUT_ALTERNATIVE_FORMAT))
          if( !memcmp( buff + 31, " G ", 3) && uncertainty_parameter < 90.)
             {                       /* replace slope w/uncertainty */
-//          sprintf( buff + 32, "U%7.3f  ", uncertainty_parameter);
-            sprintf( buff + 32, "U%5.1f  ", uncertainty_parameter);
+            snprintf_err( buff + 32, 9, "U%5.1f  ", uncertainty_parameter);
             buff[40] = ' ';
             }
       if( showing_sigmas)
          {
          if( i >= 4 && i <= 6)        /* lines w/Peri., Node, & Incl. */
             {
-            char *tptr = buff + (precision < 10 ? 19 : 9 + precision);
+            char *angle_ptr = buff + (precision < 10 ? 19 : 9 + precision);
 
-            memmove( tptr + 17, tptr, strlen( tptr) + 1);
-            memset( tptr, ' ', 17);
+            memmove( angle_ptr + 17, angle_ptr, strlen( angle_ptr) + 1);
+            memset( angle_ptr, ' ', 17);
             consider_replacing( buff, "Peri.", "sigma_omega");
             consider_replacing( buff, "Node", "sigma_Omega");
             consider_replacing( buff, "Incl.", "sigma_i");
@@ -2084,6 +2253,8 @@ int write_out_elements_to_file( const double *orbit,
                consider_replacing( buff, "a", "sigma_a:");
             else if( *buff == 'n')
                consider_replacing( buff, "n", "sigma_n:");
+            else if( *buff == 'z')
+               consider_replacing( buff, "z", "sigma_1/a");
             }
          switch( buff[0])
             {
@@ -2097,16 +2268,16 @@ int write_out_elements_to_file( const double *orbit,
             case 'P':
                {
                char *zptr = strchr( buff, 'Q');
-               char tbuff[80];
+               char apo_buff[80];
 
                if( zptr)
                   {
-                  strlcpy_error( tbuff, zptr);
-                  consider_replacing( tbuff, "Q", "sigma_Q");
+                  strlcpy_error( apo_buff, zptr);
+                  consider_replacing( apo_buff, "Q", "sigma_Q");
                   zptr[-1] = '\0';
                   }
                else                 /* no aphelion given */
-                  *tbuff = '\0';
+                  *apo_buff = '\0';
                zptr = strchr( buff, 'q');
                if( zptr)
                   {
@@ -2137,7 +2308,7 @@ int write_out_elements_to_file( const double *orbit,
                   memmove( buff, zptr, strlen( zptr) + 1);
                   consider_replacing( buff, "q", "sigma_q");
                   strlcat_error( buff, "    ");
-                  strlcat_error( buff, tbuff);
+                  strlcat_error( buff, apo_buff);
                   }
                }
                break;
@@ -2183,24 +2354,25 @@ int write_out_elements_to_file( const double *orbit,
    observation_summary_data( tbuff, obs, n_obs, options);
    fprintf( ofile, "%s\n", tbuff);
    if( elem.central_obj == 3 && elem.ecc < .99 && _include_comment( "TLE"))
-      {
-      write_tle_from_vector( tbuff, rel_orbit, elem.epoch, NULL, NULL);
-      tbuff[69] = tbuff[140] = '\0';
-      fprintf( ofile, "# %s\n# %s\n", tbuff, tbuff + 71);
-      }
+      if( !write_tle_from_vector( tbuff, rel_orbit, elem.epoch, NULL, NULL))
+         {
+         tbuff[69] = tbuff[140] = '\0';
+         fprintf( ofile, "# %s\n# %s\n", tbuff, tbuff + 71);
+         }
    if( !(options & ELEM_OUT_NO_COMMENT_DATA))
       {
-      double orb[6];
+      double orb[6], rel_orb[6];
       const bool is_ecliptic =
                   (atoi( get_environment_ptr( "VECTOR_OPTS")) != 0);
 
       memcpy( orb, orbit2, 6 * sizeof( double));
+      memcpy( rel_orb, j2000_ecliptic_rel_orbit, 6 * sizeof( double));
       if( !is_ecliptic)
          {
          ecliptic_to_equatorial( orb);
          ecliptic_to_equatorial( orb + 3);
-         ecliptic_to_equatorial( rel_orbit);
-         ecliptic_to_equatorial( rel_orbit + 3);
+         ecliptic_to_equatorial( rel_orb);
+         ecliptic_to_equatorial( rel_orb + 3);
          }
       if( _include_comment( "State"))
          {
@@ -2214,9 +2386,9 @@ int write_out_elements_to_file( const double *orbit,
             {
             fprintf( ofile, "# State vector relative to central body:\n");
             fprintf( ofile, "# %17.12f%17.12f%17.12f AU\n",
-                  rel_orbit[0], rel_orbit[1], rel_orbit[2]);
+                  rel_orb[0], rel_orb[1], rel_orb[2]);
             fprintf( ofile, "# %17.12f%17.12f%17.12f mAU/day\n",
-                  rel_orbit[3] * 1000., rel_orbit[4] * 1000., rel_orbit[5] * 1000.);
+                  rel_orb[3] * 1000., rel_orb[4] * 1000., rel_orb[5] * 1000.);
             }
          }
       if( !planet_orbiting && _include_comment( "MOID"))
@@ -2225,6 +2397,13 @@ int write_out_elements_to_file( const double *orbit,
                   moids[1], moids[2], moids[3], moids[4]);
          fprintf( ofile, "# MOIDs: Ju%10.6f Sa%10.6f Ur%10.6f Ne%10.6f\n",
                   moids[5], moids[6], moids[7], moids[8]);
+         if( moids[10])
+            {
+            fprintf( ofile, "# MOIDs:");
+            for( i = 8; i < N_MOIDS && moids[i + 2]; i++)
+               fprintf( ofile, " %s%10.6f", moid_text[i], moids[i + 2]);
+            fprintf( ofile, "\n");
+            }
          }
 
       if( !planet_orbiting && _include_comment( "OPP"))
@@ -2336,7 +2515,7 @@ int write_out_elements_to_file( const double *orbit,
          }
 
       if( _include_comment( "Sco"))
-         fprintf( ofile, "# Score: %f\n", evaluate_initial_orbit( obs, n_obs, orbit));
+         fprintf( ofile, "# Score: %f\n", evaluate_initial_orbit( obs, n_obs, orbit, curr_epoch));
       }
 
    *impact_buff = '\0';
@@ -2356,22 +2535,20 @@ int write_out_elements_to_file( const double *orbit,
       t0 = find_collision_time( &j2000_ecliptic_rel_elem, latlon, is_an_impact);
       if( t0 < 1.)      /* t0 = 1 -> it was a miss after all */
          {
-         char *end_ptr;
          const double lon = latlon[0] * 180. / PI;
          const double impact_time_td = elem.perih_time + t0;
          const double impact_time_utc = utc_from_td( impact_time_td, NULL);
 
          full_ctime( buff, impact_time_utc,
                        FULL_CTIME_HUNDREDTH_SEC | CALENDAR_JULIAN_GREGORIAN);
-         snprintf( impact_buff, sizeof( impact_buff),
+         snprintf_err( impact_buff, sizeof( impact_buff),
                " %.55s lat %+9.5f lon ", buff,
                latlon[1] * 180. / PI);
-         end_ptr = impact_buff + strlen( impact_buff);
                      /* 0 < longitude < 360;  for Earth,  show this in */
                      /* "conventional" East/West 0-180 degree format:  */
          if( elem.central_obj == 3)
             {
-            sprintf( end_ptr, "%c%.5f",
+            snprintf_append( impact_buff, sizeof( impact_buff), "%c%.5f",
                   (lon < 180. ? 'E' : 'W'),
                   (lon < 180. ? lon : 360. - lon));
             fprintf( ofile, "%s at %s\n", (is_an_impact ? "IMPACT" : "LAUNCH"),
@@ -2379,7 +2556,7 @@ int write_out_elements_to_file( const double *orbit,
             }
                      /* Then show in 0-360 format,  for all other  */
                      /* planets, and for output to file:           */
-         sprintf( end_ptr, "%9.5f", lon);
+         snprintf_append( impact_buff, sizeof( impact_buff), "%9.5f", lon);
          if( elem.central_obj != 3)
             fprintf( ofile, "%s at %s\n", (is_an_impact ? "IMPACT" : "LAUNCH"),
                              impact_buff);
@@ -2404,33 +2581,37 @@ int write_out_elements_to_file( const double *orbit,
       {
       char time_buff[40];
       bool nongrav_sigmas_found = false;
+      double output_a;
 
-      sprintf( tbuff, "#  $Name=%s", object_name);
+      snprintf_err( tbuff, 80, "#  $Name=%s", object_name);
       text_search_and_replace( tbuff + 4, " ", "%20");
                /* Epoch has to be given in YYYYMMDD.DDDDD format: */
       full_ctime( time_buff, helio_elem.perih_time,
                FULL_CTIME_YMD | FULL_CTIME_MONTHS_AS_DIGITS
                | FULL_CTIME_MICRODAYS | FULL_CTIME_LEADING_ZEROES);
       time_buff[4] = time_buff[7] = '\0';
-      sprintf( tbuff + strlen( tbuff), "  $Ty=%s  $Tm=%s  $Td=%s",
+      snprintf_append( tbuff, tbuff_size, "  $Ty=%s  $Tm=%s  $Td=%s",
                time_buff, time_buff + 5, time_buff + 8);
-      sprintf( tbuff + strlen( tbuff), "  $MA=%.5f",
+      snprintf_append( tbuff, tbuff_size, "  $MA=%.5f",
                   centralize_ang( helio_elem.mean_anomaly) * 180. / PI);
       fprintf( ofile, "%s\n", tbuff);
 
-      sprintf( tbuff, "#  $ecc=%.7f  $Eqnx=2000.", helio_elem.ecc);
+      snprintf_err( tbuff, 80, "#  $ecc=%.7f  $Eqnx=2000.", helio_elem.ecc);
       fprintf( ofile, "%s\n", tbuff);
 
-      sprintf( tbuff, "#  $a=%.7f  $Peri=%.5f  $Node=%.5f",
-                  helio_elem.major_axis,
+      output_a = helio_elem.major_axis;
+      if( fabs( output_a) > 1000000.)
+         output_a = 1000000.;       /* near-parabolic case */
+      snprintf_err( tbuff, 80, "#  $a=%.7f  $Peri=%.5f  $Node=%.5f",
+                  output_a,
                   centralize_ang( helio_elem.arg_per) * 180. / PI,
                   centralize_ang( helio_elem.asc_node) * 180. / PI);
-      sprintf( tbuff + strlen( tbuff), "  $Incl=%.5f",
+      snprintf_append( tbuff, tbuff_size, "  $Incl=%.5f",
                   helio_elem.incl * 180. / PI);
       fprintf( ofile, "%s\n", tbuff);
 
-      sprintf( tbuff, "#  $EpJD=%.3f  $q=%.6f", helio_elem.epoch, helio_elem.q);
-      sprintf( tbuff + strlen( tbuff), "  $T=%.6f  $H=%.1f",
+      snprintf_err( tbuff, 80, "#  $EpJD=%.3f  $q=%.6f", helio_elem.epoch, helio_elem.q);
+      snprintf_append( tbuff, tbuff_size, "  $T=%.6f  $H=%.1f",
                helio_elem.perih_time, helio_elem.abs_mag);
       fprintf( ofile, "%s\n", tbuff);
       fprintf( ofile, "# Sigmas avail: %d\n", available_sigmas);
@@ -2438,7 +2619,7 @@ int write_out_elements_to_file( const double *orbit,
          {
          char key[20], obuff[50];
 
-         sprintf( key, "Sigma_A%d:", i);
+         snprintf_err( key, sizeof( key), "Sigma_A%d:", i);
          if( !get_uncertainty( key, obuff, false))
             {
             fprintf( ofile, (nongrav_sigmas_found ? "   %s %s" : "# %s %s"),
@@ -2473,6 +2654,8 @@ int write_out_elements_to_file( const double *orbit,
       fclose( ofile);
       }
 
+   if( *horizons_elems)
+      write_horizons_elems( horizons_elems, &helio_elem, orbit);
    if( monte_carlo)
       monte_carlo_object_count++;
    if( monte_carlo && rms_ok)
@@ -2484,17 +2667,18 @@ int write_out_elements_to_file( const double *orbit,
          element_filename = "mpcorb.dat";
       if( *impact_buff)
          n_monte_carlo_impactors++;
-      sprintf( name_buff, "%05d", n_clones_accepted);
+      snprintf_err( name_buff, sizeof( name_buff), "%05d", n_clones_accepted);
       packed_desig_minus_spaces( virtual_full_desig, obs->packed_id);
-      sprintf( virtual_full_desig + strlen( virtual_full_desig), " [%d]",
+      snprintf_append( virtual_full_desig, sizeof( virtual_full_desig), " [%d]",
                                   monte_carlo_object_count);
       if( elem.central_obj || elem.ecc > .999999)
-         {
-         ofile = fopen_ext( get_file_name( tbuff, "virtual.txt"), monte_carlo_permits);
-         elements_in_guide_format( tbuff, &elem, virtual_full_desig, obs, n_obs);
-         fprintf( ofile, "%s%s\n", tbuff, impact_buff);
-         fclose( ofile);
-         }
+         if( !elements_in_guide_format( tbuff, &elem, virtual_full_desig, obs, n_obs))
+            {
+            ofile = fopen_ext( get_file_name( buff, "virtual.txt"), monte_carlo_permits);
+            fprintf( ofile, "%s%s\n", tbuff, impact_buff);
+            fclose( ofile);
+            }
+
 
       if( helio_elem.ecc < .999999)
          {
@@ -2504,7 +2688,8 @@ int write_out_elements_to_file( const double *orbit,
             FILE *ifile = fopen_ext( "mpcorb.hdr", "fcrb");
             time_t t0 = time( NULL);
 
-            fprintf( ofile, "Monte Carlo orbits from Find_Orb\nComputed %s", ctime( &t0));
+            fprintf( ofile, "Monte Carlo orbits from Find_Orb\nComputed %.24s\n",
+                              asctime( gmtime( &t0)));
             fprintf( ofile, "Find_Orb version %s %s\n", __DATE__, __TIME__);
             fprintf( ofile, (using_sr ? "Statistical Ranging\n" : "Full Monte Carlo\n"));
             if( ifile)
@@ -2523,9 +2708,9 @@ int write_out_elements_to_file( const double *orbit,
 //       set_statistical_ranging( 1);
       }
 
-   if( (ofile = fopen_ext( get_file_name( tbuff, "guide.txt"), "tfcwb")) != NULL)
+   if( !elements_in_guide_format( tbuff, &elem, object_name, obs, n_obs)
+         && (ofile = fopen_ext( get_file_name( buff, "guide.txt"), "tfcwb")) != NULL)
       {
-      elements_in_guide_format( tbuff, &elem, object_name, obs, n_obs);
       fprintf( ofile, "%s%s\n", tbuff, impact_buff);
       fclose( ofile);
       }
@@ -2544,6 +2729,7 @@ int write_out_elements_to_file( const double *orbit,
    fclose( ofile);
    make_linkage_json( n_obs, obs, &elem);
    free( tbuff);
+   available_sigmas = saved_available_sigmas;
    return( bad_elements);
 }
 
@@ -2561,8 +2747,6 @@ int string_compare_for_sort( const void *a, const void *b, void *context)
    return( strcmp( a1[0] + *sort_column, b1[0] + *sort_column));
 }
 
-static const char *vector_data_file = "vectors.dat";
-
 /* For each object,  we'd like to know if a solution has already been
 computed for it and stored as a state vector in 'vectors.dat'.  We
 do this by digging through the file and looking for lines with a
@@ -2577,39 +2761,38 @@ for that object.   */
 
 void set_solutions_found( OBJECT_INFO *ids, const int n_ids)
 {
-   size_t n_lines;
-   char **ilines = load_file_into_memory( vector_data_file, &n_lines, false);
-   int i, n_objs, sort_column = -1;
+   size_t n_lines, name_len = 0, i;
+   char **ilines = load_file_into_memory( "orbits.sof", &n_lines, false);
+   int sort_column = 0;
 
-   for( i = 0; i < n_ids; i++)
+   for( i = 0; i < (size_t)n_ids; i++)
       ids[i].solution_exists = 0;
    if( !ilines)
       return;
-   for( i = n_objs = 0; (size_t)i < n_lines; i++)
-      if( ilines[i][0] == ' ' && isdigit( ilines[i][1]))
-         {
-         const char *space = strchr( ilines[i] + 1, ' ');
-
-         assert( space);     /* object name starts after a space */
-         memmove( ilines[i], space + 1, strlen( space));
-         ilines[n_objs++] = ilines[i];
-         }
-   shellsort_r( ilines, n_objs, sizeof( char *),
+   while( ilines[0][name_len] && ilines[0][name_len] != '|')
+      name_len++;
+   assert( ilines[0][name_len] == '|');
+   for( i = 0; i < (size_t)n_lines; i++)
+      {
+      ilines[i][name_len] = '\0';
+      remove_trailing_cr_lf( ilines[i]);
+      if( strlen( ilines[i]) == 12)    /* combined perm & provisional ID */
+         ilines[i][5] = '\0';
+      }
+   shellsort_r( ilines, n_lines, sizeof( char *),
                            string_compare_for_sort, &sort_column);
-   for( i = 0; i < n_ids; i++)
+   for( i = 0; i < (size_t)n_ids; i++)
       {
-      size_t loc = 0, loc1, step;
-
-      for( step = 0x80000000; step; step >>= 1)
-         if( (loc1 = loc + step) < (size_t)n_objs)
-            {
-            const int compare = names_compare( ilines[loc1], ids[i].obj_name);
-
-            if( compare < 0)
-               loc = loc1;
-            if( !compare)
-               ids[i].solution_exists = 1;
-            }
+      char tname[15], *tptr = tname;
+
+      assert( strlen( ids[i].packed_desig) == 12);
+      strcpy( tname, ids[i].packed_desig);
+      text_search_and_replace( tname, " ", "");
+      if( strlen( tname) == 12)    /* combined perm & provisional ID */
+         tname[5] = '\0';
+      if( bsearch_ext_r( &tptr, ilines, n_lines, sizeof( char *),
+                        string_compare_for_sort, &sort_column, NULL))
+         ids[i].solution_exists = 1;
       }
    free( ilines);
 }
@@ -2643,10 +2826,9 @@ static void compute_two_body_state_vect( ELEMENTS *elems, double *orbit, const d
 ELEMENTS.COMET,  Find_Orb can sometimes flounder about a bit in its
 efforts to determine an orbit. */
 
-static int get_orbit_from_mpcorb_sof( const char *filename,
+static int get_orbit_from_sof( const char *filename,
                  const char *object_name, double *orbit, ELEMENTS *elems,
                  const double full_arc_len, double *max_resid)
-
 {
    FILE *ifile = fopen_ext( filename, "crb");
    int got_vectors = 0;
@@ -2655,6 +2837,7 @@ static int get_orbit_from_mpcorb_sof( const char *filename,
    if( ifile)
       {
       char buff[300], header[300], tname[15];
+      int n_extra_params = 0;
 
       if( !fgets_trimmed( header, sizeof( header), ifile))
          {
@@ -2671,23 +2854,37 @@ static int get_orbit_from_mpcorb_sof( const char *filename,
                   atoi( object_name + 2));
       else
          snprintf( tname, sizeof( tname), "%-12.12s", object_name);
+      for( size_t i = 0; i < 12; i++)
+         if( tname[i] == '(')
+            memset( tname + i, ' ', 12 - i);
       while( !got_vectors && fgets_trimmed( buff, sizeof( buff), ifile))
-         if( !memcmp( tname, buff, 12))
+         if( !memcmp( tname, buff, 12) && !_get_extra_orbit_info(
+                       tname, &n_extra_params,
+                       orbit + 6, NULL))
             {
             double extra_info[10];
+            extern int n_orbit_params, force_model;
 
             extract_sof_data_ex( elems, buff, header, extra_info);
             if( elems->epoch < 2400000.)
                printf( "JD %f\n", elems->epoch);
             assert( elems->epoch > 2400000.);
-            if( extra_info[1] - extra_info[0] > full_arc_len / 2.)
+            perturbers = 0x7fe;    /* Merc-Pluto plus moon */
+            n_orbit_params = n_extra_params + 6;
+            compute_two_body_state_vect( elems, orbit, elems->epoch);
+            push_orbit( elems->epoch, orbit);
+            if( extra_info[1] - extra_info[0] >= full_arc_len / 2.)
                {
-               compute_two_body_state_vect( elems, orbit, elems->epoch);
                got_vectors = 1;
                if( elems->ecc == 1.)     /* indicate parabolic-constraint orbit */
                   got_vectors = 2;
                *max_resid = extra_info[3];
                }
+            else
+               {
+               force_model = 0;
+               n_orbit_params = 6;
+               }
             }
       fclose( ifile);
       }
@@ -2818,13 +3015,23 @@ specify a TDB epoch.
    To do : revise to allow barycentric and other-planet-centric
 (and selenocentric) vectors,  and vectors in the body plane. */
 
+#define FOUND_ECCENTRICITY     1
+#define FOUND_TPERIH           2
+#define FOUND_Q                4
+#define FOUND_A                8
+#define FOUND_MEAN_ANOMALY    16
+
 static double extract_state_vect_from_text( const char *text,
             double *orbit, double *abs_mag)
 {
    char tbuff[81];
    size_t i = 0;
    double epoch = 0., coord_epoch = 2000.;
-   int bytes_read, central_object = 0;
+   double dist_units = 1., time_units = 1.;
+   int bytes_read, central_object = 0, quantities_found = 0;
+   bool is_state_vector, is_ecliptic = true;
+   int body_fixed = -9;
+   ELEMENTS elem;
 
    while( text[i] && text[i] != ',' && i < 80)
       i++;
@@ -2832,32 +3039,68 @@ static double extract_state_vect_from_text( const char *text,
       {
       memcpy( tbuff, text, i);
       tbuff[i] = '\0';
-      epoch = get_time_from_string( 0., tbuff, 0, NULL);
-      }
-   if( epoch)
-      {
-      text += i + 1;
-      for( i = 0; i < 6 && sscanf( text, "%lf%n", orbit + i, &bytes_read) == 1; i++)
-         text += bytes_read + 1;
-      if( i != 6)       /* didn't read a whole state vect */
-         epoch = 0.;
+      epoch = get_time_from_string( 0., tbuff, CALENDAR_JULIAN_GREGORIAN, NULL);
       }
    assert( epoch);
+   text += i + 1;
+   for( i = 0; i < 6 && sscanf( text, "%lf%n", orbit + i, &bytes_read) == 1; i++)
+      text += bytes_read + 1;
+   assert( i == 6 || i == 0);
+   is_state_vector = (i == 6);
+   memset( &elem, 0, sizeof( ELEMENTS));
    *abs_mag = 18.;
    while( *text)
       {
       if( !memcmp( text, "eq", 2))
+         is_ecliptic = false;
+      else if( !memcmp( text, "ecef", 4))
          {
-         equatorial_to_ecliptic( orbit);
-         equatorial_to_ecliptic( orbit + 3);
-         text += 2;
+         body_fixed = 3;
+         is_ecliptic = false;
          }
       else if( !memcmp( text, "ep=", 3))
          coord_epoch = atof( text + 3);
       else if( !memcmp( text, "H=", 2))
          *abs_mag = atof( text + 2);
+      else if( !memcmp( text, "Om=", 3))
+         elem.asc_node = atof( text + 3) * PI / 180.;
+      else if( !memcmp( text, "om=", 3))
+         elem.arg_per = atof( text + 3) * PI / 180.;
+      else if( !memcmp( text, "i=", 2))
+         elem.incl = atof( text + 2) * PI / 180.;
+      else if( !memcmp( text, "Tp=", 3))
+         {
+         i = 3;
+         while( i < 70 && text[i] != ',' && text[i])
+            i++;
+         assert( i < 70);
+         memcpy( tbuff, text + 3, i - 3);
+         tbuff[i - 3] = '\0';
+         elem.perih_time = get_time_from_string( 0., tbuff, CALENDAR_JULIAN_GREGORIAN, NULL);
+         quantities_found |= FOUND_TPERIH;
+         }
+      else if( !memcmp( text, "M=", 2))
+         {
+         elem.mean_anomaly = atof( text + 2) * PI / 180.;
+         quantities_found |= FOUND_MEAN_ANOMALY;
+         }
+      else if( !memcmp( text, "a=", 2))
+         {
+         elem.major_axis = atof( text + 2);
+         quantities_found |= FOUND_A;
+         }
+      else if( !memcmp( text, "q=", 2))
+         {
+         elem.q = atof( text + 2);
+         quantities_found |= FOUND_Q;
+         }
+      else if( !memcmp( text, "e=", 2))
+         {
+         elem.ecc = atof( text + 2);
+         quantities_found |= FOUND_ECCENTRICITY;
+         }
       else if( !_memicmp( text, "UTC", 3))
-         epoch = utc_from_td( epoch, NULL);
+         epoch += td_minus_utc( epoch) / seconds_per_day;
       else if( !_memicmp( text, "TDB", 3))
          {
          const double t_cen = (epoch - J2000) / 36525.;
@@ -2865,30 +3108,69 @@ static double extract_state_vect_from_text( const char *text,
          epoch -= tdb_minus_tdt( t_cen) / seconds_per_day;
          }
       else if( !memcmp( text, "km", 2))
-         for( i = 0; i < 6; i++)
-            orbit[i] /= AU_IN_KM;
+         dist_units = AU_IN_KM;
       else if( *text == 'm')
-         for( i = 0; i < 6; i++)
-            orbit[i] /= AU_IN_METERS;
+         dist_units = AU_IN_METERS;
       else if( *text == 'g')
          central_object = 3;
+      else if( *text == 'l')
+         central_object = 10;
       else if( *text == 's')
-         for( i = 3; i < 6; i++)
-            orbit[i] *= seconds_per_day;
+         time_units = seconds_per_day;
       else if( *text == 'A' && text[1] >= '1' && text[1] <= '3'
                   && text[2] == '=')
          {
          extern int n_orbit_params;
 
-         n_orbit_params = 6 + text[1] - '1';
+         n_orbit_params = 6 + text[1] - '0';
          force_model = ((n_orbit_params - 6) | 0x10);   /* assume inverse square for the nonce */
-         orbit[n_orbit_params - 7] = atof( text + 3);
+         orbit[n_orbit_params - 1] = atof( text + 3);
          }
       while( *text != ',' && *text)
          text++;
       if( *text == ',')
          text++;
       }
+   if( !is_state_vector)
+      {
+      elem.epoch = epoch;
+      if( !(quantities_found & FOUND_TPERIH))
+         elem.perih_time = elem.epoch;
+      if( quantities_found & FOUND_A)
+         elem.q = elem.major_axis * (1. - elem.ecc);
+      elem.q /= dist_units;
+      elem.gm = get_planet_mass( central_object);
+      derive_quantities( &elem, elem.gm);
+      if( quantities_found & FOUND_MEAN_ANOMALY)
+         elem.perih_time = elem.epoch - elem.mean_anomaly * elem.t0;
+      comet_posn_and_vel( &elem, elem.epoch, orbit, orbit + 3);
+      }
+   else
+      {
+      for( i = 0; i < 6; i++)
+         orbit[i] /= dist_units;
+      for( i = 3; i < 6; i++)
+         orbit[i] *= time_units;
+      }
+   if( body_fixed != -9)   /* usually Earth-centered Earth-fixed (ECEF) */
+      {
+      double matrix[9];
+      const double omega = planet_rotation_rate( body_fixed, 0) * PI / 180.;
+      const double ut = epoch - td_minus_ut( epoch) / seconds_per_day;
+
+      calc_planet_orientation( body_fixed, 0, ut, matrix);
+      for( i = 3; i < 6; i++)
+         matrix[i] = -matrix[i];
+      orbit[3] -= orbit[1] * omega;
+      orbit[4] += orbit[0] * omega;
+      deprecess_vector( matrix, orbit, orbit);
+      deprecess_vector( matrix, orbit + 3, orbit + 3);
+      }
+   if( !is_ecliptic)
+      {
+      equatorial_to_ecliptic( orbit);
+      equatorial_to_ecliptic( orbit + 3);
+      }
    if( coord_epoch != 2000.)
       {
       double precess_matrix[9];
@@ -2925,6 +3207,18 @@ int find_first_and_last_obs_idx( const OBSERVE *obs, const int n_obs,
    return( i);
 }
 
+int get_orbit_from_mpcorb_sof( const char *object_name, double *orbit,
+             ELEMENTS *elems, const double full_arc_len, double *max_resid)
+{
+   const char *mpcorb_dot_sof_filename = get_environment_ptr( "MPCORB_SOF_FILENAME");
+   int rval = 0;
+
+   if( *mpcorb_dot_sof_filename)
+      rval = get_orbit_from_sof( mpcorb_dot_sof_filename,
+                             object_name, orbit, elems, full_arc_len, max_resid);
+   return( rval);
+}
+
 /* When doing (for example) a full six-parameter fit to an orbit,  it can
 be helpful to use an epoch that is at the mid-point of the arc of
 observations that is being fitted.  This improves stability.  */
@@ -2937,15 +3231,26 @@ double mid_epoch_of_arc( const OBSERVE *obs, const int n_obs)
    return( (obs[first].jd + obs[last].jd) / 2.);
 }
 
+void reset_sr_orbits( void)
+{
+   extern double *sr_orbits;
+   extern unsigned max_n_sr_orbits;
+   extern int n_orbit_params;
+
+   if( sr_orbits)
+      free( sr_orbits);
+   sr_orbits = (double *)calloc( (size_t)max_n_sr_orbits, n_orbit_params * sizeof( double));
+   assert( sr_orbits);
+}
+
 const char *state_vect_text = NULL;
 int ignore_prev_solns;
 bool take_first_soln = false, force_final_full_improvement = false;
 int n_extra_full_steps = 0;
 
 static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit,
-               double *orbit_epoch, double *epoch_shown, unsigned *perturbers)
+               double *orbit_epoch, double *epoch_shown)
 {
-   FILE *ifile = NULL;
    int got_vectors = 0, i;
    extern int n_orbit_params;
    char object_name[80];
@@ -2960,161 +3265,47 @@ static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit
       *orbit_epoch = extract_state_vect_from_text(
                   state_vect_text, orbit, &abs_mag);
       got_vectors = (*orbit_epoch != 0.);
-      }
-   if( !got_vectors)
-      ifile = (ignore_prev_solns ? NULL : fopen_ext( vector_data_file, "crb"));
-   if( ifile)
-      {
-      char buff[120];
-      double jd1 = 0., jd2 = 0.;
-      double residual_filter_threshhold = 0.;
-
-      while( fgets_trimmed( buff, sizeof( buff), ifile))
-         {
-         i = 1;
-         while( buff[i] && buff[i] != ' ')
-            i++;
-         assert( buff[i] == ' ');
-         if( !names_compare( object_name, buff + i + 1) || (take_first_soln && !got_vectors))
-            {
-            int n_read, center = 0, is_equatorial = 0;
-            char *tptr;
-            double dist_units = 1., time_units = .001;
-
-            got_vectors = 1;
-            *orbit_epoch = atof( buff);
-            *perturbers = 0;
-            fgets_trimmed( buff, sizeof( buff), ifile);
-            tptr = strchr( buff, '#');
-            if( tptr)
-               {
-               char *tptr2;
-
-               *tptr++ = '\0';
-               tptr2 = strstr( tptr, "Ctr");
-               if( tptr2)
-                  center = atoi( tptr2 + 3);
-               if( strstr( tptr, "km"))
-                  dist_units = AU_IN_KM;
-               if( strstr( tptr, "eq"))
-                  is_equatorial = 1;
-               if( strstr( tptr, "sec"))
-                  time_units = seconds_per_day;
-               }
-            for( i = 6; i < MAX_N_PARAMS; i++)
-                orbit[i] = 0.;
-            n_read = sscanf( buff, "%lf%lf%lf%x%lf %lf %lf",
-                          &orbit[0], &orbit[1], &orbit[2], perturbers,
-                          orbit + 6, orbit + 7, orbit + 8);
-            assert( n_read >= 3 && n_read < 8);
-            n_orbit_params = n_read + 2;
-            if( n_orbit_params <= 6)
-               {
-               n_orbit_params = 6;
-               force_model = 0;
-               }
-            else
-               force_model = ((n_orbit_params - 6) | 0x10);  /* assume inv square for the nonce */
-            fgets_trimmed( buff, sizeof( buff), ifile);
-            sscanf( buff, "%lf%lf%lf%lf%lf%lf",
-                          orbit + 3, orbit + 4, orbit + 5,
-                          &residual_filter_threshhold, &jd1, &jd2);
-            for( i = 3; i < 6; i++)
-               orbit[i] /= dist_units / time_units;
-            for( i = 0; i < 3; i++)
-               orbit[i] /= dist_units;
-            if( is_equatorial)
-               {
-               equatorial_to_ecliptic( orbit);
-               equatorial_to_ecliptic( orbit + 3);
-               }
-            if( center)
-               {
-               double vect[3];
-
-               compute_observer_loc( *orbit_epoch, center, 0., 0., 0., vect);
-               for( i = 0; i < 3; i++)
-                  orbit[i] += vect[i];
-               compute_observer_vel( *orbit_epoch, center, 0., 0., 0., vect);
-               for( i = 0; i < 3; i++)
-                  orbit[i + 3] += vect[i];
-               }
-            for( i = 0; i < n_obs; i++)
-               {
-               obs[i].computed_ra  = obs[i].ra;
-               obs[i].computed_dec = obs[i].dec;
-               }
-            }
-         }
       if( got_vectors)
-         {
-         set_locs( orbit, *orbit_epoch, obs, n_obs);
-         if( jd2)
-            {
-            for( i = 0; i < n_obs; i++)
-               if( obs[i].jd < jd1 - .00001 || obs[i].jd > jd2 + .00001)
-                  obs[i].is_included = 0;
-               else
-                  if( residual_filter_threshhold &&
-                        observation_rms( obs + i) > residual_filter_threshhold)
-                     obs[i].is_included = 0;
-            }
-         do_full_improvement = true;
-         }
-      fclose( ifile);
+         push_orbit( *orbit_epoch, orbit);
       }
    if( !got_vectors && !ignore_prev_solns)
       {
       ELEMENTS elems;
-      const char *mpcorb_dot_sof_filename = get_environment_ptr( "MPCORB_SOF_FILENAME");
       const double full_arc_len = obs[n_obs - 1].jd - obs[0].jd;
       double rms_resid;
 
-      got_vectors = get_orbit_from_mpcorb_sof( "orbits.sof", obs->packed_id,
+      if( n_obs == 1)
+         got_vectors = get_orbit_from_mpcorb_sof( object_name, orbit, &elems,
+                                  full_arc_len, &rms_resid);
+      else
+         got_vectors = get_orbit_from_sof( "orbits.sof", obs->packed_id,
                                           orbit, &elems, full_arc_len, &rms_resid);
-      if( !got_vectors && *mpcorb_dot_sof_filename)
-         got_vectors = get_orbit_from_mpcorb_sof( mpcorb_dot_sof_filename,
-                             object_name, orbit, &elems, full_arc_len, &rms_resid);
       if( got_vectors)
          {
-         int n_extra_params = 0;
-
+         move_add_nstr( 2, 2, "Stored soln loaded", -1);
+         refresh_console( );
          *orbit_epoch = elems.epoch;
          if( got_vectors == 1)
-            *perturbers = 0x7fe;    /* Merc-Pluto plus moon */
-         if( _get_extra_orbit_info( obs->packed_id, perturbers, &n_extra_params,
-                     orbit + 6, NULL))
-            got_vectors = 0;
-         else
+            perturbers = 0x7fe;    /* Merc-Pluto plus moon */
+         if( n_obs > 1)
             {
-            n_orbit_params = n_extra_params + 6;
-            if( n_obs > 1)
-               {
-               set_locs( orbit, *orbit_epoch, obs, n_obs);
-               filter_obs( obs, n_obs, rms_resid * 3., 1);
-               do_full_improvement = true;
-               }
-            abs_mag = elems.abs_mag;
+            set_locs( orbit, *orbit_epoch, obs, n_obs);
+            do_full_improvement = true;
             }
+         abs_mag = elems.abs_mag;
          }
       }
    if( !got_vectors)
       {
-      *perturbers = 0;
+      perturbers = 0;
       *orbit_epoch = initial_orbit( obs, n_obs, orbit);
       if( force_final_full_improvement)
          do_full_improvement = true;
-      for( i = 0; i < n_obs; i++)
-         if( obs[i].note2 == 'R')      /* radar observations require an */
-            {                          /* added full step */
-            do_full_improvement = true;
-            break;
-            }
       }
    else if( n_obs == 1 && !strcmp( obs->reference, "Dummy"))
       {
       obs->jd = *orbit_epoch + td_minus_ut( *orbit_epoch) / seconds_per_day;
-      *perturbers = 0x7fe;    /* Merc-Pluto plus moon */
+      perturbers = 0x7fe;    /* Merc-Pluto plus moon */
       set_locs( orbit, *orbit_epoch, obs, n_obs);
       obs->ra = obs->computed_ra;
       obs->dec = obs->computed_dec;
@@ -3122,22 +3313,30 @@ static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit
                  obs->r, vector3_length( obs->obs_posn), NULL);
       obs->obs_mag = floor( obs->obs_mag * 10. + .5) * .1;
       obs->mag_precision = 1;         /* start out assuming mag to .1 mag */
+      *epoch_shown = *orbit_epoch;
+      return( got_vectors);
       }
+   for( i = 0; i < n_obs; i++)
+      if( obs[i].note2 == 'R')
+         do_full_improvement = true;
    *epoch_shown = *orbit_epoch;
+   assert( n_obs > 0 && n_obs < 100000);
    if( do_full_improvement || available_sigmas == NO_SIGMAS_AVAILABLE)
       {
       extern double automatic_outlier_rejection_limit;
       OBSERVE *saved_obs = (OBSERVE *)calloc( n_obs, sizeof( OBSERVE));
-      double prev_score;
+      double prev_score = 0.;
       int pass;
 
       if( !*get_environment_ptr( "KEEP_PREVIOUS_EPOCH") && !got_vectors)
          *epoch_shown = find_epoch_shown( obs, n_obs);
       memcpy( saved_obs, obs, n_obs * sizeof( OBSERVE));
       filter_obs( obs, n_obs, automatic_outlier_rejection_limit, 0);
+      for( i = 0; i < n_obs; i++)
+         if( obs[i].note2 == 'R')
+            obs[i].is_included = 1;
       if( got_vectors)
          attempt_extensions( obs, n_obs, orbit, *orbit_epoch);
-      prev_score = evaluate_initial_orbit( obs, n_obs, orbit);
       for( pass = 0; pass < 2; pass++)
          {
          const int64_t t0 = nanoseconds_since_1970( );
@@ -3147,6 +3346,8 @@ static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit
          push_orbit( *orbit_epoch, orbit);
          integrate_orbit( orbit, *orbit_epoch, mid_epoch);
          *orbit_epoch = mid_epoch;
+         if( !pass)
+            prev_score = evaluate_initial_orbit( obs, n_obs, orbit, *orbit_epoch);
          for( i = 0; i < 4 && (nanoseconds_since_1970( ) - t0) < QUARTER_SECOND; i++)
             {
             if( i)
@@ -3165,7 +3366,7 @@ static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit
                               ORBIT_SIGMAS_REQUESTED, *epoch_shown);
 
                }
-         if( prev_score < evaluate_initial_orbit( obs, n_obs, orbit) - .001)
+         if( prev_score < evaluate_initial_orbit( obs, n_obs, orbit, *orbit_epoch) - .001)
             {
             pop_orbit( orbit_epoch, orbit);    /* we were better off with the old orbit */
             memcpy( obs, saved_obs, n_obs * sizeof( OBSERVE));
@@ -3177,6 +3378,33 @@ static int fetch_previous_solution( OBSERVE *obs, const int n_obs, double *orbit
             }
          }
       free( saved_obs);
+      }
+               /* if a stored solution failed (i.e.,  didn't get sigmas), */
+               /* we try again,  ignoring the stored solution.            */
+   if( got_vectors && available_sigmas == NO_SIGMAS_AVAILABLE && !ignore_prev_solns)
+      {
+      move_add_nstr( 3, 2, "Stored soln FAILED", -1);
+      ignore_prev_solns = 1;
+      n_orbit_params = 6;
+      force_model = 0;
+      for( i = 0; i < n_obs; i++)
+         obs[i].is_included = !(obs[i].flags & OBS_DONT_USE);
+      got_vectors = fetch_previous_solution( obs, n_obs, orbit, orbit_epoch,
+                        epoch_shown);
+      ignore_prev_solns = 0;
+      }
+   else if( !got_vectors && available_sigmas == NO_SIGMAS_AVAILABLE && !ignore_prev_solns)
+      {                          /* failed to get sigmas;  try more SR orbits */
+      extern unsigned max_n_sr_orbits;
+
+      ignore_prev_solns = 1;
+      debug_printf( "%s failed; trying more SR orbits\n", obs->packed_id);
+      max_n_sr_orbits *= 5;
+      reset_sr_orbits( );
+      got_vectors = fetch_previous_solution( obs, n_obs, orbit, orbit_epoch,
+                        epoch_shown);
+      max_n_sr_orbits /= 5;
+      ignore_prev_solns = 0;
       }
    return( got_vectors);
 }
@@ -3280,6 +3508,32 @@ static int obj_desig_to_perturber( const char *packed_desig)
    return( rval);
 }
 
+int find_central_object( const OBSERVE *obs, const double epoch_shown,
+                        const double *ivect, double *ovect)
+{
+   extern int forced_central_body;
+   int planet_orbiting;
+
+   if( forced_central_body != ORBIT_CENTER_AUTO)
+      {
+      planet_orbiting = forced_central_body;
+      get_relative_vector( epoch_shown, ivect, ovect, planet_orbiting);
+      }
+   else
+      {
+      const int idx = obj_desig_to_perturber( obs->packed_id);
+
+      if( idx > 0 && idx < 10)         /* Merc through Pluto */
+         {
+         planet_orbiting = 0;
+         get_relative_vector( epoch_shown, ivect, ovect, planet_orbiting);
+         }
+      else
+         planet_orbiting = find_best_fit_planet( epoch_shown, ivect, ovect);
+      }
+   return( planet_orbiting);
+}
+
 double get_max_included_resid( const OBSERVE *obs, int n_obs)
 {
    double rval = 0.;
@@ -3335,7 +3589,7 @@ static void _log_problems( const OBJECT_INFO *id, const OBSERVE FAR *obs)
                " rms=%f", rms_err);
    if( *error_message)
       {
-      FILE *ofile = fopen_ext( "errors.txt", "tca");
+      FILE *ofile = fopen_ext( "errors.txt", "ca");
 
       if( ofile)
          {
@@ -3350,7 +3604,6 @@ OBSERVE FAR *load_object( FILE *ifile, OBJECT_INFO *id,
 {
    extern int n_obs_actually_loaded;
    extern int debug_level;
-   extern unsigned perturbers;
    extern int excluded_asteroid_number;
    OBSERVE FAR *obs = load_observations( ifile, id->packed_desig,
                                                 id->n_obs);
@@ -3371,10 +3624,11 @@ OBSERVE FAR *load_object( FILE *ifile, OBJECT_INFO *id,
       excluded_asteroid_number = atoi( id->obj_name + 1);      /* itself */
    else
       excluded_asteroid_number = 0;
+   compute_effective_solar_multiplier( NULL);
    if( n_obs_actually_loaded > 0)
       {
       const int got_vector = fetch_previous_solution( obs, id->n_obs, orbit,
-                            curr_epoch, epoch_shown, &perturbers);
+                            curr_epoch, epoch_shown);
 
       if( got_vector <= 0)
          *epoch_shown = find_epoch_shown( obs, id->n_obs);
@@ -3385,39 +3639,6 @@ OBSERVE FAR *load_object( FILE *ifile, OBJECT_INFO *id,
    return( obs);
 }
 
-int store_solution( const OBSERVE *obs, const int n_obs, const double *orbit,
-       const double orbit_epoch, const int perturbers)
-{
-   FILE *ofile = fopen_ext( vector_data_file, "fcab");
-
-   if( ofile)
-      {
-      char buff[80];
-      int i, j;
-
-      get_object_name( buff, obs->packed_id);
-      fprintf( ofile, "%10.1f %s\n", orbit_epoch, buff);
-      for( i = 0; i < 3; i++)
-         fprintf( ofile, "%21.16f", orbit[i]);
-      if( perturbers)
-         {
-         extern int n_orbit_params;
-
-         fprintf( ofile, " %04x", perturbers);
-         for( i = 6; i < n_orbit_params; i++)
-            fprintf( ofile, " %.9g", orbit[i + 6]);
-         }
-      get_first_and_last_included_obs( obs, n_obs, &i, &j);
-      fprintf( ofile, "\n%21.16f%21.16f%21.16f %.3f %.5f %.5f\n",
-              orbit[3] * 1000., orbit[4] * 1000., orbit[5] * 1000.,
-              get_max_included_resid( obs, n_obs) + 0.001,
-              obs[i].jd, obs[j].jd);
-      fclose( ofile);
-      }
-   return( ofile ? 0 : -1);
-}
-
-
 #define LOG_10 2.3025850929940456840179914546843642076011014886287729760333279009675726
 
 double calc_obs_magnitude( const double obj_sun,
@@ -3519,11 +3740,11 @@ double mag_band_shift( const char mag_band, int *err_code)
              {'H', 1.4 },   {'i', 0.32 },   {'I', 0.8 },
              {'J', 1.2 },   {'K', 1.7 },    {'L', 0.2 },
              {'o', 0.33 },  {'r', 0.14 },   {'R', 0.4 }, {'u', 2.5 },
-             {'U', -1.3 },  {'v', 0},       {'W', 0.4 },
+             {'U', -1.3 },                  {'W', 0.4 },
              {'w', -0.13 }, {'y', 0.32 },   {'Y', 0.7 },
              {'z', 0.26, },    {'\0', 0. } };
 
-   if( strchr( "VNT", mag_band))
+   if( strchr( "VNTjv", mag_band))
       return( 0.);
    for( i = 0; bands[i].band; i++)
       if( mag_band == bands[i].band)
@@ -3625,6 +3846,19 @@ double calc_absolute_magnitude( OBSERVE FAR *obs, const int n_obs)
       for( obs_no = 0; obs_no < n_obs; obs_no++)
          temp_obs[obs_no].is_included = 1;
       rval = _calc_absolute_magnitude_internal( temp_obs, n_obs);
+      if( !rval && object_type == OBJECT_TYPE_COMET)
+         {
+         obs_no = 0;
+         while( obs_no < n_obs && obs[obs_no].mag_band != 'T'
+                           && obs[obs_no].mag_band != 'N')
+            obs_no++;
+         if( obs_no == n_obs)    /* ah,  no obs have a 'comet' mag */
+            {
+            for( obs_no = 0; obs_no < n_obs; obs_no++)
+               temp_obs[obs_no].mag_band = default_comet_magnitude_type;
+            rval = calc_absolute_magnitude( temp_obs, n_obs);
+            }
+         }
       if( !rval && default_v_mag)   /* see 'environ.def' for an explanation of this */
          {
          for( obs_no = 0; obs_no < n_obs; obs_no++)
@@ -3720,17 +3954,17 @@ extern int sigmas_in_columns_57_to_65;
 int store_defaults( const ephem_option_t ephemeris_output_options,
          const int element_format, const int element_precision,
          const double max_residual_for_filtering,
-         const double noise_in_arcseconds)
+         const double noise_in_sigmas)
 {
    char buff[256];
 
    snprintf_err( buff, sizeof( buff), "%c,%d,%d,0,%f,%f",
                default_comet_magnitude_type,
                element_format, element_precision,
-               max_residual_for_filtering, noise_in_arcseconds);
+               max_residual_for_filtering, noise_in_sigmas);
    set_environment_ptr( "SETTINGS", buff);
    set_environment_ptr( "EPHEM_OPTIONS",
-                   write_bit_string( buff, ephemeris_output_options));
+                   write_bit_string( buff, ephemeris_output_options, sizeof( buff)));
    snprintf_err( buff, sizeof( buff), "%.3f %f %u %d", probability_of_blunder * 100.,
               overobserving_time_span,
               overobserving_ceiling,
@@ -3801,22 +4035,59 @@ int set_language( const int language)
    return( 0);
 }
 
+int load_ephemeris_settings( ephem_option_t *ephemeris_output_options,
+      int *n_steps, char *obscode, char *step_size, char *ephem_start,
+      const char *config)
+{
+   char buff[100];
+   const char *settings;
+   int n_found, bytes_read;
+
+   snprintf_err( buff, sizeof( buff), "STORED_EPHEM_%s", config);
+   settings = get_environment_ptr( buff);
+   if( !*settings && !strcmp( config, "F"))  /* factory default: geocentric, */
+      settings = "500 20 10,16 1h +0";    /* 20 one-hour steps starting now  */
+   n_found = sscanf( settings, "%s %d %s %s %n", obscode, n_steps, buff,
+                                                step_size, &bytes_read);
+   assert( n_found == 4 || !n_found);
+   if( n_found < 4)
+      return( -1);
+   *ephemeris_output_options = parse_bit_string( buff);
+   strlcpy_err( ephem_start, settings + bytes_read, 50);
+   return( 0);
+}
+
+int save_ephemeris_settings( const ephem_option_t ephemeris_output_options,
+      const int n_steps, const char *obscode, const char *step_size,
+      const char *ephem_start, const char *config)
+{
+   char buff[150], eph_option_string[256], env_var[25];
+
+   write_bit_string( eph_option_string, ephemeris_output_options,
+                        sizeof( eph_option_string));
+   snprintf_err( env_var, sizeof( env_var), "STORED_EPHEM_%s", config);
+   snprintf_err( buff, sizeof( buff), "%s %d %s %s %s", obscode, n_steps,
+                     eph_option_string, step_size, ephem_start);
+   set_environment_ptr( env_var, buff);
+   return( 0);
+}
+
 unsigned always_included_perturbers;
 
 int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
          int *element_precision, double *max_residual_for_filtering,
-         double *noise_in_arcseconds)
+         double *noise_in_sigmas)
 {
    ephem_option_t unused_ephemeris_output_options;
    int unused_element_format;
    int unused_element_precision;
    double unused_max_residual_for_filtering;
-   double unused_noise_in_arcseconds;
+   double unused_noise_in_sigmas;
    const char *language = get_environment_ptr( "LANGUAGE");
    extern double minimum_jd, maximum_jd;
    extern double maximum_observation_span;
-   extern int use_config_directory;
-   extern double *sr_orbits;
+   extern double automatic_outlier_rejection_limit;
+   extern double default_automatic_outlier_rejection_limit;
    extern unsigned max_n_sr_orbits;
    int use_sigmas_int;
    unsigned long obsolete_ephem_output_options;
@@ -3824,8 +4095,19 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
    const char *ephem_bitstring = get_environment_ptr( "EPHEM_OPTIONS");
    const char *eop_filename = get_environment_ptr( "EOP_FILE");
    const char *albedo = get_environment_ptr( "OPTICAL_ALBEDO");
-   const char *obs_range = get_environment_ptr( "OBSERVATION_DATE_RANGE");
+   extern double minimum_observation_jd;
+   extern double maximum_observation_jd;
+   const char *outlier_limit = get_environment_ptr( "OUTLIER_REJECTION_LIMIT");
+#if !defined( _WIN32) && !defined( __WATCOMC__)
+   const char *output_dir = get_environment_ptr( "OUTPUT_DIR");
+#else
+   const char *output_dir = get_environment_ptr( "WIN_OUTPUT_DIR");
+#endif
+   extern const char *output_directory;
+   char cospar_name[255];
 
+   if( !output_directory && *output_dir)
+      output_directory = output_dir;
 #if !defined( _WIN32) && !defined( __WATCOMC__)
    findorb_already_running = (check_for_other_processes( 1) != 0);
 #endif
@@ -3850,8 +4132,8 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
       element_precision = &unused_element_precision;
    if( !max_residual_for_filtering)
       max_residual_for_filtering = &unused_max_residual_for_filtering;
-   if( !noise_in_arcseconds)
-      noise_in_arcseconds = &unused_noise_in_arcseconds;
+   if( !noise_in_sigmas)
+      noise_in_sigmas = &unused_noise_in_sigmas;
    if( sscanf( get_environment_ptr( "TIME_RANGE"), "%lf,%lf",
                &minimum_jd, &maximum_jd) == 2)
       {
@@ -3863,7 +4145,7 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
                &default_comet_magnitude_type,
                element_format, element_precision,
                &obsolete_ephem_output_options,
-               max_residual_for_filtering, noise_in_arcseconds);
+               max_residual_for_filtering, noise_in_sigmas);
 
    if( !*ephem_bitstring)     /* set defaults;  see 'environ.def' */
       ephem_bitstring = "10,16";
@@ -3887,33 +4169,33 @@ int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
 
       combine_all_observations = "";
       }
-   if( use_config_directory)
-      {
-      char cospar_name[255];
 
-      make_config_dir_name( cospar_name, "cospar.txt");
-      load_cospar_file( cospar_name);
-      }
+   default_config_dir_name( cospar_name, "cospar.txt");
+   load_cospar_file( cospar_name);
    max_n_sr_orbits = atoi( get_environment_ptr( "MAX_SR_ORBITS"));
    if( !max_n_sr_orbits)
       max_n_sr_orbits = 500;
-   sr_orbits = (double *)calloc( (size_t)max_n_sr_orbits, 7 * sizeof( double));
-   assert( sr_orbits);
+   reset_sr_orbits( );
    sscanf( get_environment_ptr( "PERTURBERS"), "%x", &always_included_perturbers);
    if( *albedo)
       optical_albedo = atof( albedo);
-   if( *obs_range)
+   if( !maximum_observation_jd)     /* hasn't already been set elsewhere */
       {
-      extern double minimum_observation_jd;  /* default 1100 Jan 1 */
-      extern double maximum_observation_jd;  /* default 2300 Jan 1 */
+      const char *obs_range = get_environment_ptr( "OBSERVATION_DATE_RANGE");
+      int n_found;
 
-      const int n_found = sscanf( obs_range, "%lf,%lf",
+      if( !*obs_range)
+         obs_range = "1100,2300";
+      n_found = sscanf( obs_range, "%lf,%lf",
                     &minimum_observation_jd,
                     &maximum_observation_jd);         /* see environ.def */
       assert( n_found == 2);
       minimum_observation_jd = YEAR_TO_JD( minimum_observation_jd);
       maximum_observation_jd = YEAR_TO_JD( maximum_observation_jd);
       }
+   if( *outlier_limit)
+      default_automatic_outlier_rejection_limit = atof( outlier_limit);
+   automatic_outlier_rejection_limit = default_automatic_outlier_rejection_limit;
    return( 0);
 }
 
@@ -4033,16 +4315,18 @@ static void improve_mpc_colors( const int n_obs, const OBSERVE FAR *obs,
                   }
                }
          for( j = 0; j < max_n_colors; j++)
-            if( counts[j] < counts[color])
+            if( counts[j] < counts[color] ||
+                     (counts[j] == counts[color] && !(rand( ) % 3)))
                {
+               if( counts[j] < counts[color])
+                  changes_made = 1;
                color = j;
                sdata[i].color = (char)color;
-               changes_made = 1;
                }
          assert( color >=0 && color < max_n_colors);
          }
       n_iterations++;
-      assert( n_iterations < 10);
+      assert( n_iterations < 50);
       }
 }
 
diff --git a/environ.def b/environ.def
index 6e30337a..1598cab5 100644
--- a/environ.def
+++ b/environ.def
@@ -7,11 +7,11 @@
    settings are written to 'environ.dat'.  If you decide at some point that
    you'd like to reset to factory defaults,  just delete 'environ.dat'.
 
-   Windows Find_Orb ignores the following 'CONSOLE_OPTS' line.  For the
-   console flavor of Find_Orb,  this line gives the default MPC code for
-   ephems, which items are shown on-screen, residual display format, and
-   whether all,  some,  or only one MPC code(s) are displayed.
-CONSOLE_OPTS=500 15 3 1
+   The following line gives the default MPC code for ephems;  a zero for
+   a now-obsolete quantity;  and (for interactive Find_Orb) quantities
+   specifying how residuals are displayed and whether all,  some,  or
+   only one MPC code(s) are displayed at the bottom of the screen.
+CONSOLE_OPTS=500 0 3 1
 
    The 'settings' give the comet magnitude type used (defaults to 'N', or
    'nuclear');  the format used for orbital elements;  the precision used
@@ -61,19 +61,14 @@ TIME_RANGE=-1000,3000
    back or into the future.
 OBSERVATION_DATE_RANGE=1100,2300
 
-   MPC has requested that NEOCP data not be redistributed.  So in
-   pseudo-MPECs,  NEOCP observations are "redacted" (blacked out and the
-   data replaced with garbage).  The following observers have kindly given
-   permission for their NEOCP observations to be redistributed in
-   "unredacted" form.  (Contact me if you're willing to be added to this
-   list.)  An asterisk indicates that observations of geocentric objects
-   should remain redacted.
-       In some cases,  a specific program code is greenlit.  'J13:#',  for
-   example,  means that NEOCP observations from (J13) with program code '#'
-   will be shown unredacted.
-GREENLIT=033 291 568 595 691 703 718 970 C95 G58 G96 H01 H41 H43 H45 I41 I52
-GREENLIT2=I81 I93 J69 J95 K80 T05* T08* V03 V06 V11 Y00 Z37 Z48 Z80
-GREENLIT3=851:0 H06:q I22:2 I89:; J13:# U69:| Q62:d
+   Some observers have requested that their observations not be
+   re-distributed.  (Sometimes embargoed until a paper is written,  for
+   example.)  For specific observations,  one can put an exclamation mark
+   (!) in column 73 of the 80-column record. ATLAS would prefer that their
+   observations of artsats (but not of heliocentric objects) not be
+   re-distributed,  so their obscodes are followed by an asterisk.
+   Obscodes without an asterisk would just be redacted in their entirety.
+REDACTED=M22* T05* T08* W22*
 
    We default to assuming that no object will have an observed arc greater
    than 200 years,  and that if it _is_ longer than that,  it's a mistake.
@@ -96,7 +91,7 @@ MAX_OBSERVATION_SPAN=200
       2020 May 22: corrected Arecibo parameters based on
    http://www.naic.edu/~pradar/detect.php . As that page explains,  Hurricane
    Maria downgraded the power level to 350 kW (was 900) and the gain to 7
-   (was 10).  Hope I'll be able to bump those values back up someday soon...
+   (was 10).  Sadly,  it didn't get upgraded.
 RADAR_251=350000,24,7,70.5,1.5e-11
 RADAR_253=430000,17,.94,20,1e-11
    The Parkes radio telescope in Australia lacks an official MPC code.  But it
@@ -173,7 +168,7 @@ BC405_ASTEROIDS=300
    ftp://ssd.jpl.nasa.gov/pub/xfr/gm_Horizons.pck.
 ASTEROID_PERT_LIST=
 
-   By default,  geoocentric elements are referred to the J2000 _equator_.
+   By default,  geocentric elements are referred to the J2000 _equator_.
    Everything else (heliocentric and other non-earth-centric) is referred
    to the J2000 _ecliptic_.  Set the following to be 1 to force all
    elements to be J2000 ecliptic (including geocentric ones),  or 2 to
@@ -201,7 +196,7 @@ GEO_TERMS=6
    which you just integrate the accelerations from all bodies).  I'm still
    experimenting with both methods.  But you will probably be best off leaving
    this value at zero,  meaning Cowell is used.
-ENCKE=1
+ENCKE=
 
    By default,  the DRAG_SHUTOFF=1 tells Find_Orb not to include the effects
    of atmospheric drag.  Set it to zero if you want objects entering the
@@ -224,7 +219,7 @@ AUTO_ARC_LEN=7300
    unit to Earth radii (this assumes the equatorial radius of 6378.140 km.)
    The final value gives the time unit:  1=days (default),  24=hours,
    1440=minutes, 86400=seconds.  For example,  VECTOR_OPTS=1,149597870.7,86400
-   would get you ecliptic vectors in kilometers and km/s.
+   would get you ecliptic J2000 vectors in kilometers and km/s.
       By default,  the vectors will be in the J2000 epoch.  You can add
    (for example) ',2016' to get output in the J2016 epoch,  or ',t' for
    output in true coordinates of date,  or ',m' for mean coordinates of
@@ -265,7 +260,7 @@ IOD_TIMEOUT=20
    rename it.
 # BC405_FILENAME=/home/phred/big/asteroid_ephemeris.txt
 
-   I had a request (https://groups.yahoo.com/neo/groups/find_orb/conversations/messages/35)
+   I had a request (https://projectpluto.com/groups/find_orb/msg33.htm)
    for an option to output planetary state vectors at the epoch of the orbital
    elements to 'elements.txt'.  If you want to do that,  set PLANET_STATES=1.
    By default,  it's blank and planet states are not written out.
@@ -312,7 +307,12 @@ LANGUAGE=e
    RA) or degrees/arcmin (for dec) with zero to eight places after the
    decimal.  Format numbers 200 to 215 are for RA only,  to get decimal
    degrees.  Note that the higher-precision values will be almost
-   meaningless noise.
+   meaningless noise.  Also,  note that the menu for RA/dec formats (shown
+   when you turn RA/dec display on for ephems) is in 'efindorb.txt';  that
+   file has more comments (and allows you to add/remove formats).
+      A full list of formats is provided at
+   https://github.com/Bill-Gray/lunar/blob/mpc_fmt.cpp
+   (search for comments above the get_ra_dec() function.)
 RA_DEC_FORMAT=3,2
 
    By default,  Find_Orb does a decent job of figuring out which objects
@@ -366,7 +366,7 @@ EOP_FILE=finals.all
    By default,  magnitudes in ephemerides are shown to tenths.  Set
    the following to MAG_DIGITS=2 to get hundredths (almost always
    a meaningless level of precision,  but some people do get good
-   photometry...)
+   photometry),  MAG_DIGITS=3 for thousandths,  etc.
 MAG_DIGITS=1
 
    By default,  sigmas and covariance matrix values in 'covar.txt'
@@ -375,7 +375,8 @@ MAG_DIGITS=1
    to +/- 0.3141592653 AU;  0.31 AU would suffice,  and many would
    argue for 0.3.  In some cases,  though,  you may want/need more
    digits.  Increment FULL_SIGMAS,  and you get an extra digit of
-   precision in both sigmas and in (most) 'covar.txt' values.
+   precision in both sigmas and in (most) 'covar.txt' values.  The
+   value set for FULL_SIGMAS must be at least 2 and no greater than 10.
 FULL_SIGMAS=3
 
    In computing SNRs in ephemerides,  Find_Orb defaults to assuming
@@ -444,15 +445,6 @@ GALACTIC_ADDENDUM=
    "it's really small".  Obviously,  if possible,  supply photometry.
 DEFAULT_V_MAG=
 
-   The entries below tell us that,  for example,  the Earth-Moon L1 point
-   is 84.906572% of the way to the moon from earth,  and so on for L2 and L3,
-   with similar L1/2/3 distances for the Sun-Earth and Sun-Jupiter collinear
-   Lagrange points.  These values can be computed -- see /junk/lagrange.c --
-   but it's simpler just to store these precomputed values.
-LAGRANGE_003010=0.84906572, 1.16783275, -0.99291206
-LAGRANGE_000003=0.98998902, 1.01007824, -0.99999823
-LAGRANGE_000005=0.93331933, 1.06978454, -0.99944357
-
    The 'elements.txt' file created by Find_Orb has some 'comment' data not
    shown by default.  You can toggle to it by clicking on the orbital elements
    shown on-screen,  and some people just look at the 'elements.txt' file
@@ -481,6 +473,53 @@ SIGMAS_FILE=
    is best placed.  This is useful with telescope networks where you might
    well shift the imaging to whichever scope is best placed at a given time.
    Note that these 'MPC codes' also have lines in rovers.txt (q.v.).
+   Las Cumbres Observatory operates two two-meter telescopes,  lumped
+   here as (LC2),  and several one-meter telescopes,  lumped as (LC1).
 GROUP_ATL=M22 T05 T08 W68
 GROUP_LC2=E10 F65
-GROUP_LC1=V37 W85 K91 Q63 Z31 097
+GROUP_LC1=V37 W85 K91 Q63 Z31 097 T04
+
+   By default,  astrometric outliers by three sigmas will be rejected.  That's
+   set by the following variable.  Set it to 9999999 to cause all observations
+   to be included no matter how bad they are.  (Not something I recommend,  but
+   you can do it.)
+OUTLIER_REJECTION_LIMIT=3
+
+   By default,  MOIDs will be shown for eight planets,  if they are low enough
+   to be "interesting".  Set N_MOIDS=14,  and six asteroid MOIDs will also be
+   shown (again,  only if they're low enough).  Don't set it to a higher value.
+   At least at present,  those added six are all we've got.
+N_MOIDS=8
+
+   As a Find_Orb extension,  observations that are not to be distributed are
+   marked with a '!' character in column 73.  If PRIVATE_OBS is left unset and
+   you load up such observations,  Find_Orb will inquire as to whether those
+   observations should be used.  PRIVATE_OBS=0 will skip the question and
+   cause those observations to be included.  PRIVATE_OBS=1 will skip the
+   question and cause those observations to be ignored.
+PRIVATE_OBS=
+
+    By default,  motion units in ephemerides are in arcminutes per hour (or,
+    equivalently,  arcseconds per minute).  One can set the units with the
+    following parameter.  The first character must be ", ', or d.  The
+    second must be /.  The third must be s(econds), m(inutes), h(ours), or
+    d(ays).  Requests for other units (milliradians,  etc.) will be
+    entertained.
+MOTION_UNITS="/min
+
+   By default,  'temporary' files such as ephemerides,  astrometry reformatted
+   to ADES,  debugging files,  orbital elements and ephemerides in text and JSON
+   formats and more are written to the configuration directory ~/.find_orb (Linux)
+   or to the current directory (Windows).  You can specify a directory explicitly
+   with the following parameters,  and 'temporary' files will be put there instead.
+OUTPUT_DIR=
+WIN_OUTPUT_DIR=
+
+   (Humans should never have to edit the following line.)  If Find_Orb
+   encounters an unknown (and possibly newly assigned) observatory code,
+   it will automatically download the latest copy of MPC's ObsCodes.html.  To
+   avoid hammering MPC's servers, it will check the following values,  giving
+   the JD of the last time it downloaded the file and a 'delay' time (by
+   default,  0.1 day = 2.4 hours).  If the previous download was within that
+   delay,  it doesn't make another request.
+UPDATE_OBSCODES_HTML=2460824.384279 0.100000
diff --git a/eph2tle.cpp b/eph2tle.cpp
index 4815e7f0..49483a5b 100644
--- a/eph2tle.cpp
+++ b/eph2tle.cpp
@@ -63,7 +63,7 @@ doing a sufficiently exhaustive search in such cases. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+#include "assert2.h"
 #include <math.h>
 #include <ctype.h>
 #include <time.h>
@@ -71,6 +71,7 @@ doing a sufficiently exhaustive search in such cases. */
 #include "date.h"
 #include "norad.h"
 #include "lsquare.h"
+#include "stringex.h"
 #include "afuncs.h"
 
 #define AU_IN_KM 1.495978707e+8
@@ -82,6 +83,10 @@ doing a sufficiently exhaustive search in such cases. */
 #define FIT_EPOCH    2
 #define FIT_BOTH     3
 
+         /* from 'norad_in.h' */
+#define earth_radius_in_km           6378.135
+#define xke                             0.0743669161331734132
+
 int vector_to_tle( tle_t *tle, const double *state_vect, const double epoch);
 
 int verbose = 0;
@@ -272,10 +277,10 @@ static char *fgets_trimmed( char *buff, const size_t buffsize, FILE *ifile)
 
    if( rval)
       {
-      size_t i = 0;
+      size_t i = strlen( rval);
 
-      while( rval[i] != 10 && rval[i] != 13 && rval[i])
-         i++;
+      while( i && rval[i - 1] <= ' ')
+         i--;
       rval[i] = '\0';
       }
    return( rval);
@@ -489,6 +494,25 @@ static FILE *fopen_from_findorb_dir( const char *filename, const char *permits)
    return( rval);
 }
 
+static void auto_set_desigs( char *norad_desig, char *intl_desig)
+{
+   FILE *ifile = fopen( "/home/phred/tles/tle_list.txt", "rb");
+   char buff[200];
+
+   assert( ifile);
+   while( fgets( buff, sizeof( buff), ifile))
+      if( !memcmp( buff, "  note : next artsat will be ", 29))
+         {
+         fclose( ifile);
+         memcpy( norad_desig, buff + 29, 5);
+         memcpy( intl_desig, buff + 37, 8);
+         printf( "Desigs set to '%s', '%s'\n", norad_desig, intl_desig);
+         return;
+         }
+   assert( 0);       /* we shouldn't get here */
+}
+
+
 /* Certain objects have names (preliminary designations from surveys),  but
 no NORAD or international designation.  The following ensures they get one,
 which won't (we lightheartedly hope) conflict with other designations.  The
@@ -533,20 +557,20 @@ int main( const int argc, const char **argv)
 {
    FILE *ifile = fopen_from_findorb_dir( "eph2tle.txt", "rb");
    FILE *ofile = stdout;
-   int i, j, count = 0, output_freq = 10, line = 0;
+   int i, j, output_freq = 10, line = 0;
    int tles_written = 0;
    int n_params = 6, n_iterations = 15;
    const int max_n_params = 8;
    char buff[200], obj_name[100];
-   const char *default_intl_desig = "00000", *norad_desig = "99999";
-   const char *intl_desig = default_intl_desig;
+   const char *default_intl_desig = "00000A";
+   char intl_desig[9], norad_desig[6];
    double *slopes = (double *)calloc( max_n_params * 6, sizeof( double));
    double *vectors, worst_resid_in_run = 0., worst_mjd = 0.;
    double tdt = 0., *computed_vects;
    int ephem, progress_bar_freq = 2, ref_frame = -1;
    int epoch_index = -1;
    tle_t tle;
-   const time_t t0 = time( NULL);
+   const time_t curr_t = time( NULL);
    bool use_precession = true, archival = false;
    double step;
    unsigned n_steps, total_lines;
@@ -555,17 +579,19 @@ int main( const int argc, const char **argv)
    double levenberg_marquardt_lambda0 = 0.;
    double sum_of_worst_resids = 0.;
    double dist_units = 1., time_units = 1.;
+   double lowest_perigee = 1e+10, lowest_perigee_jd = 0.;
    const char *search_dist = NULL;
    long end_of_header_offset = 0L;
 
    if( argc < 2)
       error_exit( -1);
-
+   strlcpy_error( intl_desig, default_intl_desig);
+   strlcpy_error( norad_desig, "99999");
    setvbuf( stdout, NULL, _IONBF, 0);
    memset( &tle, 0, sizeof( tle_t));
    tle.classification = 'U';
    tle.ephemeris_type = EPHEM_TYPE_DEFAULT;
-   tle.bulletin_number = (int)( t0 / seconds_per_day - BULLETIN_EPOCH);
+   tle.bulletin_number = (int)( curr_t / seconds_per_day - BULLETIN_EPOCH);
    *obj_name = '\0';
    for( i = 1; i < argc; i++)
       if( argv[i][0] == '-')
@@ -621,10 +647,12 @@ int main( const int argc, const char **argv)
                output_freq = atoi( argv[i] + 2);
                break;
             case 'n': case 'N':
-               norad_desig = argv[i] + 2;
+               strlcpy_error( norad_desig, argv[i] + 2);
+               if( *norad_desig == 'a' && !norad_desig[1])
+                  auto_set_desigs( norad_desig, intl_desig);
                break;
             case 'i': case 'I':
-               intl_desig = argv[i] + 2;
+               strlcpy_error( intl_desig, argv[i] + 2);
                break;
             case 'l': case 'L':
                sscanf( argv[i] + 2, "%lf", &levenberg_marquardt_lambda0);
@@ -669,7 +697,7 @@ int main( const int argc, const char **argv)
       error_exit( -4);
       }
    fprintf( ofile, "# Made by eph2tle, compiled " __DATE__ " " __TIME__ "\n");
-   fprintf( ofile, "# Run at %s#\n", ctime( &t0));
+   fprintf( ofile, "# Run at %.24s UTC\n#\n", asctime( gmtime( &curr_t)));
    if( archival)
       fprintf( ofile, "# No updates     (archival TLEs)\n");
    if( search_dist)
@@ -696,10 +724,10 @@ int main( const int argc, const char **argv)
    if( fgets_trimmed( buff, sizeof( buff), ifile))
       {
       bool writing_data = false;
-      double mjdt;
+      double mjdt, mjdt_end;
       char *tptr = strstr( buff, "(500) Geocentric: ");
 
-      while( *buff == ';')       /* skip leading comments,  if any */
+      while( *buff == ';' || *buff == '#')       /* skip leading comments,  if any */
          if( !fgets_trimmed( buff, sizeof( buff), ifile))
             {
             fprintf( stderr, "Nothing but comments in '%s'\n", argv[1]);
@@ -721,16 +749,17 @@ int main( const int argc, const char **argv)
          ref_frame = 0;
          }
       mjdt = tdt - 2400000.5;
+      mjdt_end = mjdt + step * (double)( total_lines - total_lines % output_freq);
       if( tptr && !*obj_name)
          strcpy( obj_name, tptr + 18);
       fprintf( ofile, "# Ephem range: %f %f %f\n",
-            mjdt, mjdt + step * (double)total_lines, step * (double)output_freq);
+            mjdt, mjdt_end, step * (double)output_freq);
       while( fgets_trimmed( buff, sizeof( buff), ifile))
          {
          if( !memcmp( buff, "Created ", 8))
             writing_data = true;
          if( writing_data && *buff != '#')
-            fprintf( ofile, "# %s\n", buff);
+            fprintf( ofile, (*buff ? "# %s\n" : "#%s\n"), buff);
          if( !memcmp( buff, "Orbital elements: ", 18) && !*obj_name)
             strcpy( obj_name, buff + 19);
          if( !memcmp( buff, "Ephemeris", 9))
@@ -745,7 +774,7 @@ int main( const int argc, const char **argv)
             if( tptr)
                tle.norad_number = atoi( tptr + 6);
             }
-         if( intl_desig == default_intl_desig)
+         if( !strcmp( intl_desig, default_intl_desig))
             for( tptr = obj_name; *tptr; tptr++)
                if( atoi( tptr) > 1900 && tptr[4] == '-' &&
                      atoi( tptr + 5) > 0)
@@ -787,9 +816,8 @@ int main( const int argc, const char **argv)
       for( i = 0; i < output_freq && fgets( buff, sizeof( buff), ifile);
                                                       i++, sptr += 6)
          {
-         double jdt, jd_utc;
+         double jdt, utc;
          double precession_matrix[9], ivect[6];
-         size_t j;
 
          if( sscanf( buff, "%lf%lf%lf%lf%lf%lf%lf", &jdt,
                         ivect, ivect + 1, ivect + 2,
@@ -805,7 +833,7 @@ int main( const int argc, const char **argv)
             fprintf( stderr, "JDT %f is outside the valid range\n", jdt);
             return( -3);
             }
-         jd_utc = jdt - td_minus_utc( jdt) / seconds_per_day;
+         utc = jdt - td_minus_utc( jdt) / seconds_per_day;
          for( j = 0; j < 6; j++)
             ivect[j] /= dist_units;
          for( j = 3; j < 6; j++)
@@ -817,7 +845,7 @@ int main( const int argc, const char **argv)
             }
          if( use_precession)
             setup_precession( precession_matrix, 2000.,
-                                      2000. + (jd_utc - 2451545.) / 365.25);
+                                      2000. + (utc - 2451545.) / 365.25);
          else
             set_identity_matrix( precession_matrix);
          precess_vector( precession_matrix, ivect, sptr);
@@ -994,11 +1022,28 @@ int main( const int argc, const char **argv)
                     FULL_CTIME_YMD | FULL_CTIME_FORMAT_HH_MM);
 //    if( !failure)
          {
+         const double revs_per_day = tle_to_output.xno * minutes_per_day / (2. * PI);
+
+         if( tle.ephemeris_type != EPHEM_TYPE_HIGH)
+            {
+            const double semimajor_axis =
+                pow( xke / tle_to_output.xno, 2. / 3.) * earth_radius_in_km;
+            const double perigee = semimajor_axis * (1. - tle_to_output.eo);
+
+            if( lowest_perigee > perigee)
+               {
+               lowest_perigee = perigee;
+               lowest_perigee_jd = tdt;
+               }
+            }
 //       if( tle.ephemeris_type != EPHEM_TYPE_HIGH)
             fprintf( ofile, "\n# Worst residual: %.2f km\n",
                           worst_resid);
 //       else
 //          fprintf( ofile, "\n");
+
+         assert( tle.ephemeris_type == EPHEM_TYPE_HIGH
+                  || revs_per_day < 20.);  /* allows some margin for suborbital TLEs */
          write_elements_in_tle_format( obuff, &tle_to_output);
          if( verbose)
             {
@@ -1030,9 +1075,7 @@ int main( const int argc, const char **argv)
 //    else
 //       fprintf( ofile, "FAILED (%d) for JD %.2f = %s\n", failure,
 //                      jd_utc, buff);
-      count = -1;
       tles_written++;
-      count++;
       line++;
       if( ofile != stdout && !(line % progress_bar_freq))
          {
@@ -1074,10 +1117,15 @@ int main( const int argc, const char **argv)
       else
          break;
       }
-   printf( "Freeing vectors\n");
+   lowest_perigee -= earth_radius_in_km;
+   if( lowest_perigee < 150.)
+      {
+      full_ctime( buff, lowest_perigee_jd,
+                    FULL_CTIME_YMD | FULL_CTIME_FORMAT_HH_MM);
+      fprintf( stderr, "LOWEST PERIGEE = %.1f km at %s\n", lowest_perigee, buff);
+      }
    free( vectors);
    free( slopes);
-   printf( "All done\n");
    return( 0);
 }
 
diff --git a/eph2tle.txt b/eph2tle.txt
index a93f7d52..f158f00a 100644
--- a/eph2tle.txt
+++ b/eph2tle.txt
@@ -56,6 +56,12 @@
 # these TLEs.  (Sat_ID and all programs by me,  Bill Gray,  will use these
 # TLEs correctly.  But I may be the only one doing that.)
 #
+#    If you're stuck with software that can't handle these TLEs,  please
+# let me know.  I can probably provide "traditional" SDP4-fitted TLEs for
+# the object in question.  They will be less precise,  but possibly good
+# enough for your use case (and,  as with all the TLEs I produce,  the error
+# will be a known quantity).
+#
 ;        (End SGP4-only section)
 #    Also,  if you use a TLE outside the "correct" time range (between
 # its MJD and that of the next TLE),  all bets are off.  I've carefully
diff --git a/eph_expl.txt b/eph_expl.txt
index 744f0cdc..874ad104 100644
--- a/eph_expl.txt
+++ b/eph_expl.txt
@@ -64,10 +64,10 @@ midway between the vector from observer to target and the vector
 from sun to target.  This can be useful in analyzing light curves.
 # 34
 
-   The 'galactic confusion' is computed from star counts per unit
-area from Gaia-DR2.  Values range from zero (effectively no
-confusion) to 100 (densest parts of the Milky Way,  Magellanic
-Clouds,  or globular clusters).
+   The 'galactic confusion' is computed from star counts per unit area
+from Gaia-DR2.  Values range from zero (effectively no confusion) to
+100 (densest parts of the Milky Way,  Magellanic Clouds,  or globular
+clusters).  See https://projectpluto.com/gal_conf.htm for details.
 # 30
 
    'PsAng' is applied mostly to comets : it is the position angle at which
@@ -85,9 +85,14 @@ somewhere between this angle and the one specified by 'PsAng',  the
 theoretical angle at which an ionized gas trail would be seen.
 # 32
 
-   'PlAng' is the angle between the observer and the target's orbital plane,
-as measured from the target.  If it is positive,  you are looking at the
-object from above the ecliptic.  This quantity can be useful with comets.
+   'PlAng' is the angle between the observer and the target's heliocentric
+orbital plane, as measured from the target.  If it is positive,  you are
+looking at the object from above the ecliptic.  This quantity can be
+useful with comets.
+
+   JPL's Horizons service calculates this quantity using the barycentric
+orbital plane.  This usually results in small differences,  but they can
+be larger if the perihelion distance is low.
 #  5
 
    Apparent motions are given in arcminutes/hour,  or (equivalently)
@@ -112,6 +117,10 @@ to look farther,  or not nearly as far,  as the uncertainties say.
 
    The object will probably be offset from nominal somewhere along the
 indicated position angle,  especially if the orbit is well determined.
+# 38
+
+   Three-letter constellation abbreviations specify the constellation
+containing that RA/dec,  as defined by the IAU's 1930 delineation.
 
 # Type 1   (state vectors)
 # Type 2   (positions)
diff --git a/ephem0.cpp b/ephem0.cpp
index 398ab1e5..5244f68a 100644
--- a/ephem0.cpp
+++ b/ephem0.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <stdlib.h>
 #include <time.h>
 #include <ctype.h>
-#include <assert.h>
+#include "assert2.h"
 #include <stdbool.h>
 #include "watdefs.h"
 #include "afuncs.h"
@@ -67,18 +67,16 @@ int write_residuals_to_file( const char *filename, const char *ast_filename,
           const int n_obs, const OBSERVE FAR *obs_data, const int format);
 void light_time_lag( const double jde, const double *orbit,       /* orb_func.c */
              const double *observer, double *result, const int is_heliocentric);
-void put_observer_data_in_text( const char FAR *mpc_code, char *buff);
 int make_pseudo_mpec( const char *mpec_filename, const char *obj_name);
                                               /* ephem0.cpp */
 int earth_lunar_posn( const double jd, double FAR *earth_loc,
                                        double FAR *lunar_loc);
 bool nighttime_only( const char *mpc_code);                 /* mpc_obs.cpp */
+double get_planet_mass( const int planet_idx);                /* orb_func.c */
 void remove_trailing_cr_lf( char *buff);      /* ephem0.cpp */
 const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
 void set_environment_ptr( const char *env_ptr, const char *new_value);
 uint64_t parse_bit_string( const char *istr);                /* miscell.cpp */
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
 void format_dist_in_buff( char *buff, const double dist_in_au); /* ephem0.c */
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #ifdef __GNUC__
@@ -90,7 +88,6 @@ int calc_derivatives( const double jd, const double *ival, double *oval,
 char *iso_time( char *buff, const double jd, const int precision);   /* elem_out.c */
 double mag_band_shift( const char mag_band, int *err_code);   /* elem_out.c */
 char *get_file_name( char *filename, const char *template_file_name);
-double current_jd( void);                       /* elem_out.cpp */
 double utc_from_td( const double jdt, double *delta_t);     /* ephem0.cpp */
 double diameter_from_abs_mag( const double abs_mag,      /* ephem0.cpp */
                                      const double optical_albedo);
@@ -101,13 +98,10 @@ int get_object_name( char *obuff, const char *packed_desig);   /* mpc_obs.c */
 int get_residual_data( const OBSERVE *obs, double *xresid, double *yresid);
 int setup_planet_elem( ELEMENTS *elem, const int planet_idx,
                                           const double t_cen);   /* moid4.c */
+void calc_approx_planet_orientation( const int planet,        /* runge.cpp */
+         const int system_number, const double jde, double *matrix);
 char *mpc_station_name( char *station_data);       /* mpc_obs.cpp */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
-int remove_rgb_code( char *buff);                              /* ephem0.cpp */
-static void output_signed_angle_to_buff( char *obuff, const double angle,
-                               const int precision);         /* ephem0.cpp */
-static void output_angle_to_buff( char *obuff, const double angle,
-                               const int precision);         /* ephem0.cpp */
 static void put_residual_into_text( char *text, const double resid,
                                  const int resid_format);    /* ephem0.cpp */
 FILE *open_json_file( char *filename, const char *env_ptr, const char *default_name,
@@ -125,6 +119,19 @@ const char *elements_filename = "elements.txt";
 static expcalc_config_t exposure_config;
 extern int n_orbit_params;
 
+/* Optimization can result in memmove() being remapped to memcpy()
+when the compiler can tell that the latter will actually work.  But you
+can then getting spurious warnings from Valgrind.  This code suppresses
+those spurious warnings,  and adds a check that we won't put data beyond
+the end of the buffer nor copy data that comes from after the buffer. */
+
+void *memmove_err( void *dest, const void *src, const size_t n, const void *endptr)
+{
+   assert( (char *)endptr >= (char *)dest + n);
+   assert( (char *)endptr >= (char *)src  + n);
+   return( memmove( dest, src, n));
+}
+
 /* Returns parallax constants (rho_cos_phi, rho_sin_phi) in AU. */
 
 int lat_alt_to_parallax( const double lat, const double ht_in_meters,
@@ -199,11 +206,11 @@ static void show_dist_in_au( char *buff, const double dist_in_au)
       fmt = "%7.4f";             /* " 1.2345" */
    else
       fmt = "%7.5f";             /* " .12345" */
-   snprintf( buff, 8, fmt, dist_in_au);
+   snprintf_err( buff, 8, fmt, dist_in_au);
    *buff = ' ';   /* remove leading zero for small amounts */
 }
 
-static const char *si_prefixes = "kMGTPEZYXWVUSRQONLJIHFDCBA";
+static const char *si_prefixes = "kMGTPEZYRQXWVUSONLJIHFDCBA";
 static bool use_au_only = false;
 
 /* Given a non-negative value,  this gives a four-character output
@@ -223,23 +230,23 @@ static void show_packed_with_si_prefixes( char *buff, double ival)
          {
          ival /= 1000.;
          if( ival < 9.9)
-            snprintf( buff, 5, "%3.1f%c", ival, si_prefixes[count]);
+            snprintf_err( buff, 5, "%3.1f%c", ival, si_prefixes[count]);
          else if( ival < 999.)
-            snprintf( buff, 5, "%3u%c", (unsigned)ival, si_prefixes[count]);
+            snprintf_err( buff, 5, "%3u%c", (unsigned)ival, si_prefixes[count]);
          count++;
          }
       }
    else if( ival > 99.9)
-      snprintf( buff, 5, "%4u", (unsigned)( ival + .5));
+      snprintf_err( buff, 5, "%4u", (unsigned)( ival + .5));
    else if( ival > 9.99)
-      snprintf( buff, 5, "%4.1f", ival);
+      snprintf_err( buff, 5, "%4.1f", ival);
    else if( ival > .99)
-      snprintf( buff, 5, "%4.2f", ival);
+      snprintf_err( buff, 5, "%4.2f", ival);
    else
       {
       char tbuff[7];
 
-      snprintf( tbuff, sizeof( tbuff), "%5.2f", ival);
+      snprintf_err( tbuff, sizeof( tbuff), "%5.2f", ival);
       strcpy( buff, tbuff + 1);  /* store value without leading 0 */
       }
 }
@@ -258,15 +265,15 @@ void format_dist_in_buff( char *buff, const double dist_in_au)
                   /* for objects within a million km (about 2.5 times   */
                   /* the distance to the moon),  switch to km/m/cm/mm:  */
       if( dist_in_km < .0099)                 /* 0 to 9900 millimeters: */
-         snprintf( buff, 8, "%5.0fmm", dist_in_km * 1e+6);    /* " NNNNmm" */
+         snprintf_err( buff, 8, "%5.0fmm", dist_in_km * 1e+6);    /* " NNNNmm" */
       else if( dist_in_km < .099)             /* 990 to 9900 centimeters: */
-         snprintf( buff, 8, "%5.0fcm", dist_in_km * 1e+5);    /* " NNNNcm" */
+         snprintf_err( buff, 8, "%5.0fcm", dist_in_km * 1e+5);    /* " NNNNcm" */
       else if( dist_in_km < 99.)          /* 99 to 99000 meters: */
-         snprintf( buff, 8, "%6.0fm", dist_in_km * 1e+3);     /* " NNNNNm" */
+         snprintf_err( buff, 8, "%6.0fm", dist_in_km * 1e+3);     /* " NNNNNm" */
       else if( dist_in_km < 999.)         /* 99.0 to 999.9 kilometers: */
-         snprintf( buff, 8, "%6.1fk", dist_in_km);            /* " NNN.Nk" */
+         snprintf_err( buff, 8, "%6.1fk", dist_in_km);            /* " NNN.Nk" */
       else if( dist_in_km < 999999.)      /* 999.9 to 999999 km: */
-         snprintf( buff, 8, "%7.0f", dist_in_km);
+         snprintf_err( buff, 8, "%7.0f", dist_in_km);
       else if( dist_in_au > 9999.999)
          {
          double dist_in_light_years =
@@ -284,9 +291,9 @@ void format_dist_in_buff( char *buff, const double dist_in_au)
             else
                {
                if( dist_in_light_years < 9.9)
-                  snprintf( buff, 8, "%4.1fxLY", dist_in_light_years);
+                  snprintf_err( buff, 8, "%4.1fxLY", dist_in_light_years);
                else
-                  snprintf( buff, 8, "%4.0fxLY", dist_in_light_years);
+                  snprintf_err( buff, 8, "%4.0fxLY", dist_in_light_years);
                buff[4] = si_prefixes[idx];
                }
             }
@@ -300,7 +307,7 @@ void format_dist_in_buff( char *buff, const double dist_in_au)
                fmt = "%5.2fLY";           /* " 1.23LY" */
             else
                fmt = "%5.3fLY";           /* " .123LY" */
-            snprintf( buff, 8, fmt, dist_in_light_years);
+            snprintf_err( buff, 8, fmt, dist_in_light_years);
             }
          }
       else
@@ -336,7 +343,23 @@ static void format_velocity_in_buff( char *buff, double vel)
       else        /* we give up;  it's too fast */
          format =  " !!!!!!";
       }
-   snprintf( buff, 8, format, vel);
+   snprintf_err( buff, 8, format, vel);
+}
+
+static void ra_dec_to_alt_az_2( const int planet, const DPT *ra_dec, DPT *alt_az,
+                              const DPT *latlon, const double jd_utc, double *hour_angle)
+{
+   double matrix[9], vect[3], vect_out[3];
+
+   polar3_to_cartesian( vect, -ra_dec->x, ra_dec->y);
+   calc_planet_orientation( planet, 0, jd_utc, matrix);
+   spin_matrix( matrix, matrix + 3, latlon->x);
+   if( hour_angle)
+      *hour_angle = atan2( -dot_product( vect, matrix + 3), dot_product( vect, matrix));
+   spin_matrix( matrix, matrix + 6, PI / 2. - latlon->y);
+   precess_vector( matrix, vect, vect_out);
+   alt_az->x = atan2( vect_out[1], vect_out[0]);
+   alt_az->y = asine( vect_out[2]);
 }
 
 /* Rob Matson asked about having the program produce ECF (Earth-Centered
@@ -348,6 +371,20 @@ planets as well. */
 double find_lat_lon_alt( const double ut, const double *ivect,
                   const int planet_no, double *lat_lon, const bool geometric);
 
+double seconds_per_time_unit_symbol( const char *symbol)
+{
+   size_t i;
+   const char *units = "smhdwy";
+   const double rvals[6] = { 1., 60., seconds_per_hour, seconds_per_day,
+               7. * seconds_per_day, 365.25 * seconds_per_day };
+
+   for( i = 0; units[i]; i++)
+      if( *symbol == units[i])
+         return( rvals[i]);
+   assert( 0);
+   return 0.;
+}
+
 /* 'get_step_size' parses input text to get a step size in days,  so that */
 /* '4h' becomes .16667 days,  '30m' becomes 1/48 day,  and '10s' becomes  */
 /* 10/(24*60*60) days.  The units (days, hours, minutes,  or seconds) are */
@@ -394,26 +431,7 @@ double get_step_size( const char *stepsize, char *step_units, int *step_digits)
          units = tolower( units);
          if( step_units)
             *step_units = units;
-         switch( units)
-            {
-            case 'd':
-               break;
-            case 'h':
-               step /= hours_per_day;
-               break;
-            case 'm':
-               step /= minutes_per_day;
-               break;
-            case 's':
-               step /= seconds_per_day;
-               break;
-            case 'w':
-               step *= 7.;
-               break;
-            case 'y':
-               step *= 365.25;
-               break;
-            }
+         step *= seconds_per_time_unit_symbol( &units) / seconds_per_day;
          }
    return( step);
 }
@@ -466,7 +484,7 @@ static void setup_obj_loc( obj_location_t *p, double *orbit,
       p[i].dec = asin( topo[2] / p[i].r);
       p[i].sun_earth = vector3_length( obs_posn);
       p[i].sun_obj = vector3_length( orbit);
-      orbit += 6;
+      orbit += n_orbit_params;
       }
 }
 
@@ -532,7 +550,7 @@ static int put_ephemeris_posn_angle_sigma( char *obuff, const double dist,
    if( integer_posn_ang < 0)
       integer_posn_ang += 180;
    if( computer_friendly)
-      snprintf( resid_buff, sizeof( resid_buff), "  %6u",
+      snprintf_err( resid_buff, sizeof( resid_buff), "  %6u",
                            (unsigned)dist_in_arcsec);
    else
       {
@@ -540,15 +558,13 @@ static int put_ephemeris_posn_angle_sigma( char *obuff, const double dist,
                                     RESIDUAL_FORMAT_OVERPRECISE);
       resid_buff[5] = '\0';
       }
-   snprintf( obuff, 13, "%s %3d", resid_buff + 1, integer_posn_ang);
+   snprintf_err( obuff, 13, "%s %3d", resid_buff + 1, integer_posn_ang);
    return( integer_posn_ang);
 }
 
-/* Old MSVCs and OpenWATCOM lack erf() and many other math functions: */
-
-#if defined( _MSC_VER) && (_MSC_VER < 1800) || defined( __WATCOMC__)
-double erf( double x);     /* orb_fun2.cpp */
-#endif
+#if( __cplusplus < 201103L)
+double erf( double x);   /* orb_fun2.cpp : replacement for */
+#endif                  /* pre-C99 or pre-C++11 */
 
 #define SWAP( A, B, TEMP)   { TEMP = A;  A = B;  B = TEMP; }
 
@@ -756,7 +772,6 @@ static int find_precovery_plates( OBSERVE *obs, const int n_obs,
                   && (prob = precovery_in_field( &field, p3, n_orbits, 0.)) > .1)
                {
                char time_buff[40], buff[200];
-               int i;
                bool matches_an_observation = false;
                bool show_it = true;
                double obj_ra = p3->ra, obj_dec = p3->dec;
@@ -778,7 +793,7 @@ static int find_precovery_plates( OBSERVE *obs, const int n_obs,
                   obj_ra *= 180. / PI;
                   obj_dec *= 180. / PI;
                   if( !show_base_60)
-                     snprintf( buff, sizeof( buff), "%8.4f %8.4f",
+                     snprintf_err( buff, sizeof( buff), "%8.4f %8.4f",
                                        obj_ra, obj_dec);
                   else
                      {
@@ -794,7 +809,7 @@ static int find_precovery_plates( OBSERVE *obs, const int n_obs,
                      char filename[20];
 
                      current_file_number = field.file_number;
-                     snprintf( filename, sizeof( filename), "css_%d.csv",
+                     snprintf_err( filename, sizeof( filename), "css_%d.csv",
                                     current_file_number);
                      if( original_file)
                         fclose( original_file);
@@ -873,7 +888,7 @@ static inline int get_radar_data( const char *mpc_code, RADAR_DATA *rdata)
    int rval = -1;
 
    memset( rdata, 0, sizeof( RADAR_DATA));
-   snprintf( tbuff, sizeof( tbuff), "RADAR_%.3s", mpc_code);
+   snprintf_err( tbuff, sizeof( tbuff), "RADAR_%.3s", mpc_code);
    tptr = get_environment_ptr( tbuff);
    if( tptr)
       if( sscanf( tptr, "%lf,%lf,%lf,%lf,%lf",
@@ -1134,7 +1149,7 @@ and planet.  We can then use the above 'sunlight_visible' function
 to determine the fraction of the sun that is visible (not blocked),
 almost always 100% (you don't spend much time in the earth's shadow).
 
-   See http://www.minorplanet.info/MPB/issues/MPB_45-3.pdf for a discussion
+   See https://mpbulletin.org/issues/MPB_45-3.pdf for a discussion
 of two instances where this matters.  2008 TC3 and 2018 LA,  impactors,
 are other examples of objects passing through earth's shadow,  as are
 numerous artsats.
@@ -1171,7 +1186,7 @@ double shadow_check( const double *planet_loc,
    r = sqrt( r2);
    angular_sep = acos( (dot - r2) / (d * r));
    ang_size_sun = SUN_RADIUS_IN_AU / r;
-   ang_size_planet = planet_radius_in_au / d;
+   ang_size_planet = asin( planet_radius_in_au / d);
    if( ang_size_sun + ang_size_planet < angular_sep)
       return( 1.);         /* no overlap */
    else if( ang_size_planet > ang_size_sun + angular_sep)
@@ -1187,10 +1202,10 @@ double shadow_check( const double *planet_loc,
       for( i = 0; i <= n_splits; i++)
          {
          const double area = r0 * r0 + (1. - r0 * r0) * (double)i / (double)n_splits;
-         const double r = sqrt( area);
-         const double intensity = solar_disc_intensity( r);
+         const double r1 = sqrt( area);
+         const double intensity = solar_disc_intensity( r1);
          const double fraction =
-                sunlight_visible( ang_size_sun * r, ang_size_planet, angular_sep) * r * r;
+                sunlight_visible( ang_size_sun * r1, ang_size_planet, angular_sep) * area;
 
          rval += (intensity - prev_intensity) * (fraction - prev_fraction)
                         / (area - prev_area);
@@ -1218,13 +1233,15 @@ static void format_motion( char *buff, const double motion)
 
    if( fabs_motion > 999999.)
       motion_format = "-------";
+   else if( fabs_motion > 9999.)
+      motion_format = "%7.0f";
    else if( fabs_motion > 999.)
       motion_format = "%7.1f";
    else if( fabs_motion > 99.9)
       motion_format = "%7.2f";
    else
       motion_format = "%7.3f";
-   snprintf( buff, 8, motion_format, motion);
+   snprintf_err( buff, 8, motion_format, motion);
 }
 
 #ifdef NOT_CURRENTLY_USED
@@ -1319,7 +1336,7 @@ inline void calc_sr_dist_and_posn_ang( const DPT *ra_decs, const unsigned n_obje
    z2 = c / z1;
    *dist = sqrt( z1);
    assert( z1 > z2);    /* z1 should be the _major_ axis */
-   *posn_ang = atan2( sum_xy, sum_x2 - z2);
+   *posn_ang = atan2( sum_x2 - z2, sum_xy);
     if( *posn_ang < 0.)
       *posn_ang += PI;
 #ifdef ENABLE_SCATTERPLOTS
@@ -1369,12 +1386,44 @@ static inline void clean_up_json_number( char *out_text)
       memmove( out_text, out_text + 1, strlen( out_text));
 }
 
+static double get_motion_unit_text( char *obuff)
+{
+   double motion_units = 1.;
+   const char *units_set = get_environment_ptr( "MOTION_UNITS");
+
+   if( !*units_set)
+      units_set = "'/hr";
+   strlcpy_err( obuff, units_set, 7);
+   if( *obuff == 'm')
+      {
+      obuff++;
+      motion_units = 1000.;
+      }
+   switch( *obuff)
+      {
+      case '"':
+         motion_units *= 60.;
+         break;
+      case 'd':
+         motion_units /= 60.;
+         break;
+      default:
+         break;
+      }
+   assert( obuff[1] == '/');
+   motion_units *= seconds_per_time_unit_symbol( obuff + 2) / 3600.;
+   return( motion_units);
+}
+
+
 static int create_json_ephemeris( FILE *ofile, FILE *ifile, char *header,
                      const double jd_start, const double step)
 {
    char buff[1024];
    int line_no = 0;
 
+   get_motion_unit_text( buff);
+   text_search_and_replace( header, buff, "'/hr");
    text_search_and_replace( header, "-", "");
    text_search_and_replace( header, " RA ", " RA RA60 ");
    text_search_and_replace( header, " Dec ", " Dec Dec60 ");
@@ -1393,6 +1442,16 @@ static int create_json_ephemeris( FILE *ofile, FILE *ifile, char *header,
          const char *preceder = (line_no ? ",\n" : "");
          const int step_number = (step ? (int)(( atof( buff) - jd_start) / step + .5) : line_no);
 
+         if( step_number < 0)
+            {
+            FILE *debug_file = fopen_ext( "ephem.err", "tfcwb");
+
+            fseek( ifile, 0L, SEEK_SET);
+            while( fgets_trimmed( buff, sizeof( buff), ifile))
+               fprintf( debug_file, "%s\n", buff);
+            fclose( debug_file);
+            return( -1);
+            }
          fprintf( ofile, "%s      \"%d\": {", preceder, step_number);
          while( *hptr && *bptr)
             {
@@ -1451,7 +1510,7 @@ static int create_json_ephemeris( FILE *ofile, FILE *ifile, char *header,
                {
                const size_t len = strlen( out_text);
 
-               memmove( out_text + 1, out_text, len + 1);
+               memmove_err( out_text + 1, out_text, len + 1, out_text + sizeof( out_text));
                *out_text = out_text[len + 1] = '\"';
                out_text[len + 2] = '\0';
                }
@@ -1480,7 +1539,7 @@ that a directory exists for it.  For example,   given a filename
 
    it'll mkdir( "/home"), mkdir ("/home/joe"),  ... "/home/joe/z/k32/hi_there". */
 
-static void make_path_available( const char *filename)
+void make_path_available( const char *filename)
 {
    char path[PATH_MAX];
    int i;
@@ -1502,13 +1561,14 @@ static void make_path_available( const char *filename)
 #ifndef _WIN32
 void fix_home_dir( char *filename)
 {
-   if( filename[0] == '~' && filename[1] == '/')
+   if( filename[0] == '~')
       {
       const char *home_dir = getenv( "HOME");
-      const size_t len = strlen( home_dir);
+      const size_t len = (home_dir ? strlen( home_dir) : 0);
 
       memmove( filename + len, filename + 1, strlen( filename));
-      memcpy( filename, home_dir, len);
+      if( home_dir)
+         memcpy( filename, home_dir, len);
       }
 }
 #endif
@@ -1537,19 +1597,25 @@ unique and semi-private ID for the JSON file). See
 information. */
 
 unsigned random_seed;
+double _mpc_standard_epoch = 0.;        /* see fo.cpp */
 
 FILE *open_json_file( char *filename, const char *env_ptr, const char *default_name,
                   const char *packed_desig, const char *permits)
 {
    char tbuff[100], full_permits[20];
 
+   if( _mpc_standard_epoch)       /* generating element files for MPC */
+      strlcpy_error( tbuff, "MPC_");
+   else
+      *tbuff = '\0';
 #ifdef _WIN32
-   strlcpy_error( tbuff, "WIN_");
+   strlcat_error( tbuff, "WIN_");
+#endif
    strlcat_error( tbuff, env_ptr);
    env_ptr = get_environment_ptr( tbuff);
-#else
-   env_ptr = get_environment_ptr( env_ptr);
-#endif
+
+   if( !strcmp( env_ptr, "none"))
+      return( NULL);
    if( !*env_ptr)
       {
       get_file_name( filename, default_name);
@@ -1586,6 +1652,8 @@ static int combine_json_elems_and_ephems( const char *packed_desig, FILE *ephem_
    bool in_ephemerides = false;
 
    ofile = open_json_file( buff, "JSON_COMBINED_NAME", "combined.json", packed_desig, "wb");
+   if( !ofile)
+      return( -1);
    elem_file = open_json_file( buff, "JSON_ELEMENTS_NAME", "elements.json", packed_desig, "rb");
    while( !obs_end_found && fgets( buff, sizeof( buff), elem_file))
       {
@@ -1659,6 +1727,66 @@ static double find_closest_approach( const double *input_orbit, double jde,
    return( jde);
 }
 
+double get_approach_info( const double *orbit, double epoch,
+                            const int planet_no, double *dist)
+{
+   double step = 0., torbit[MAX_N_PARAMS];
+   double t_neg = 0., t_pos = 0.;
+   const double tolerance = 1e-5;
+   size_t n_iterations = 0;
+   const size_t max_iter = 30;
+
+   memcpy( torbit, orbit, n_orbit_params * sizeof( double));
+   do
+      {
+      double planet_state[6], rel_state[6], r2, v_dot_r, new_epoch;
+      size_t i;
+
+      compute_observer_loc( epoch, planet_no, 0., 0., 0., planet_state);
+      compute_observer_vel( epoch, planet_no, 0., 0., 0., planet_state + 3);
+      for( i = 0; i < 6; i++)
+         rel_state[i] = torbit[i] - planet_state[i];
+//    step2 = step;
+      r2 = dot_product( rel_state, rel_state);
+      v_dot_r = dot_product( rel_state, rel_state + 3);
+      if( v_dot_r < 0.)
+         t_neg = epoch;
+      else
+         t_pos = epoch;
+      if( r2 > 0.005 * 0.005)
+         step = -dot_product( rel_state, rel_state + 3)
+                / dot_product( rel_state + 3, rel_state + 3);
+      else
+         {
+         ELEMENTS elem;
+
+         elem.gm = get_planet_mass( planet_no);
+         elem.central_obj = planet_no;
+         calc_classical_elements( &elem, rel_state, epoch, 1);
+         step = elem.perih_time - epoch;
+         }
+      if( dist)
+         *dist = sqrt( r2);
+//    if( n_iterations % 3 == 2)      /* use Aitken delta-squared iteration */
+//        elem.perih_time = epoch - step2 - step2 * step2 / (step - step2);
+      new_epoch = epoch + step;
+      if( t_neg && t_pos)
+         if( (new_epoch - t_neg) * (new_epoch - t_pos) > 0. || n_iterations % 7 == 0)
+            {
+            debug_printf( "Outside brackets\n");
+            new_epoch = (t_neg + t_pos) / 2.;
+            }
+      integrate_orbit( torbit, epoch, new_epoch);
+      debug_printf( " %d : Integrated %f to %f -> step %f\n", (int)n_iterations, epoch,
+                                     new_epoch, step);
+      epoch = new_epoch;
+      n_iterations++;
+      assert( n_iterations < max_iter);
+      }
+      while( fabs( step) > tolerance);
+   return( epoch);
+}
+
 static void add_lon_lat_to_ephem( char *buff, const size_t buflen,
                const double lon_in_radians, const double lat_in_radians)
 {
@@ -1822,6 +1950,35 @@ double find_next_auto_step( const double target_diff, const bool going_backward,
    return( rval);
 }
 
+int add_ephemeris_details( FILE *ofile, const double start_jd,
+                                               const double end_jd)
+{
+   time_t t0;
+   char tbuff[128];
+   FILE *ifile;
+   extern const char *elements_filename;
+   const char *vector_options = get_environment_ptr( "VECTOR_OPTS");
+
+   t0 = time( NULL);
+   fprintf( ofile, "\nCreated %s", ctime( &t0));
+
+   full_ctime( tbuff, start_jd, CALENDAR_JULIAN_GREGORIAN);
+   fprintf( ofile, "Ephemeris start: %s\n", tbuff);
+
+   full_ctime( tbuff, end_jd, CALENDAR_JULIAN_GREGORIAN);
+   fprintf( ofile, "Ephemeris end:   %s\n", tbuff);
+
+   fprintf( ofile, "Times are all TDT\n");
+   fprintf( ofile, "Positions/velocities are in %s J2000\n",
+                      atoi( vector_options) ? "ecliptic" : "equatorial");
+
+   ifile = fopen_ext( get_file_name( tbuff, elements_filename), "tfcrb");
+   while( fgets( tbuff, sizeof( tbuff), ifile))
+      fwrite( tbuff, strlen( tbuff), 1, ofile);
+   fclose( ifile);
+   return( 0);
+}
+
 /* A lunar eclipse is said to have an 'eclipse magnitude' U of 0 when the
 umbral phase starts/ends,  and 1 when totality starts/ends.  During
 totality,  the magnitude will be greater than 1.  During the penumbral
@@ -2025,7 +2182,7 @@ static int get_ephem_times_from_file( const char *filename)
    ifile = fopen_ext( filename, "rb");
    if( !ifile)
       {
-      snprintf( buff, sizeof( buff), "'%s' not found\n", filename);
+      snprintf_err( buff, sizeof( buff), "'%s' not found\n", filename);
       generic_message_box( buff, "o");
       return( 0);
       }
@@ -2037,12 +2194,13 @@ static int get_ephem_times_from_file( const char *filename)
    while( fgets_trimmed( buff, sizeof( buff), ifile))
       if( *buff != '#')
          {
-         double jd = get_time_from_string( 0., buff + byte_offset, FULL_CTIME_YMD, NULL);
+         double jd = get_time_from_string( 0., buff + byte_offset,
+                         FULL_CTIME_YMD | CALENDAR_JULIAN_GREGORIAN, NULL);
 
          if( jd > 1.)
             {
             if( time_system)   /* Input times are in TD;  cvt to UTC */
-               jd = utc_from_td( jd, NULL) / seconds_per_day;
+               jd = utc_from_td( jd, NULL);
             list_of_ephem_times[n_times++] = jd;
             }
          else if( !memcmp( buff, "OPTION ", 7))
@@ -2108,13 +2266,25 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
    double curr_jd = jd_start, real_jd_start = jd_start;
    const bool fake_astrometry = ((options & 7) == OPTION_FAKE_ASTROMETRY);
    const char *group_data;
-
-   snprintf( buff, sizeof( buff), "GROUP_%.3s", note_text + 1);
+   int n_mag_places = atoi( get_environment_ptr( "MAG_DIGITS"));
+   char motion_unit_text[7];
+   double motion_units;
+   const bool showing_rvel_sigmas = (options & OPTION_RADIAL_VEL_OUTPUT)
+                                 && (options & OPTION_RV_AND_DELTA_SIGMAS)
+                                 && n_objects > 1;
+   const bool showing_delta_sigmas = !(options & OPTION_SUPPRESS_DELTA)
+                                 && (options & OPTION_RV_AND_DELTA_SIGMAS)
+                                 && n_objects > 1;
+
+   motion_units = get_motion_unit_text( motion_unit_text);
+   strlcat( motion_unit_text, "----", sizeof( motion_unit_text));
+
+   snprintf_err( buff, sizeof( buff), "GROUP_%.3s", note_text + 1);
    group_data = get_environment_ptr( buff);
    if( (!cinfo->rho_cos_phi && !cinfo->rho_sin_phi && !use_observation_times && !show_geo_quantities
                && !*group_data
                && memcmp( note_text, "(Opt)", 5)) || ephem_type != OPTION_OBSERVABLES)
-      options &= ~(OPTION_ALT_AZ_OUTPUT | OPTION_VISIBILITY | OPTION_MOON_ALT
+      options &= ~(OPTION_ALT_AZ_OUTPUT | OPTION_MOON_ALT
                      | OPTION_MOON_AZ | OPTION_SUN_ALT | OPTION_SUN_AZ
                      | OPTION_SNR | OPTION_EXPOSURE_TIME
                      | OPTION_SKY_BRIGHTNESS | OPTION_SUPPRESS_UNOBSERVABLE);
@@ -2170,6 +2340,8 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
       }
    if( cinfo->planet < 0 && cinfo->planet != -2)      /* bad observatory code */
       return( -3);
+   if( n_mag_places < 1)
+      n_mag_places = 1;
    if( !abs_mag)
       abs_mag = atof( get_environment_ptr( "ABS_MAG"));
    if( ephem_type != OPTION_OBSERVABLES || !(options & OPTION_SHOW_SIGMAS))
@@ -2242,13 +2414,15 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
          }
       if( note_text)
          fprintf( ofile, "#%s\n", note_text);
-      snprintf( buff, sizeof( buff), "Date %s%s  ",
+      snprintf_err( buff, sizeof( buff), "Date %s%s  ",
                      (*timescale ? "(TT)"  : "(UTC)"), hr_min_text);
       if( !(options & OPTION_SUPPRESS_RA_DEC))
          snprintf_append( buff, sizeof( buff), "-RA%s   -Dec%s  ",
                                     added_prec_text_ra + 3, added_prec_text_dec + 4);
       if( !(options & OPTION_SUPPRESS_DELTA))
          snprintf_append( buff, sizeof( buff), "-delta ");
+      if( showing_delta_sigmas)
+         snprintf_append( buff, sizeof( buff), "-sgDel ");
       if( !(options & OPTION_SUPPRESS_SOLAR_R))
          snprintf_append( buff, sizeof( buff), "-r---- ");
       if( !(options & OPTION_SUPPRESS_ELONG))
@@ -2280,14 +2454,19 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
       if( options & OPTION_ORBIT_PLANE_ANGLE)
          snprintf_append( buff, sizeof( buff), "-PlAng- ");
       if( abs_mag)
+         {
          snprintf_append( buff, sizeof( buff), " mag");
+         for( i = n_mag_places - 1; i; i--)
+            strlcat_error( buff, " ");
+         }
 
       if( options & OPTION_LUNAR_ELONGATION)
-         snprintf_append( buff, sizeof( buff), "  LuElo");
+         snprintf_append( buff, sizeof( buff),
+                     (cinfo->planet == 10 ? "  EaElo" : "  LuElo"));
       if( options & OPTION_MOTION_OUTPUT)
-         snprintf_append( buff, sizeof( buff), " -'/hr-- --PA--");
+         snprintf_append( buff, sizeof( buff), " -%s --PA--", motion_unit_text);
       if( options & OPTION_SEPARATE_MOTIONS)
-         snprintf_append( buff, sizeof( buff), " -RA--'/hr--dec-");
+         snprintf_append( buff, sizeof( buff), " -RA--%sdec-", motion_unit_text);
 
       if( options & OPTION_ALT_AZ_OUTPUT)
          snprintf_append( buff, sizeof( buff), " alt -az");
@@ -2301,6 +2480,8 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
          snprintf_append( buff, sizeof( buff), " Maz");
       if( options & OPTION_RADIAL_VEL_OUTPUT)
          snprintf_append( buff, sizeof( buff), "  rvel-");
+      if( showing_rvel_sigmas)
+         snprintf_append( buff, sizeof( buff), "  sigRV");
       if( options & OPTION_SPACE_VEL_OUTPUT)
          snprintf_append( buff, sizeof( buff), "  svel-");
       if( show_radar_data)
@@ -2313,13 +2494,15 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
          snprintf_append( buff, sizeof( buff), " \"-sig-PA");
       if( ephem_type == OPTION_OBSERVABLES)
          {
-         const char *cf_filename = "eph_json.txt";
+         const char *alt_file_name = get_environment_ptr( "ALT_EPHEM_FILENAME");
 
          header = (char *)malloc( 1024);
          assert( header);
          strlcpy_err( header, buff, 1024);
-         computer_friendly_ofile = fopen_ext( cf_filename, is_default_ephem ? "tfcw+" : "fw+");
-         assert( computer_friendly_ofile);
+         if( !*alt_file_name)
+            alt_file_name = "alt_eph.txt";
+         computer_friendly_ofile = fopen_ext( alt_file_name,
+                                          is_default_ephem ? "tfcw+" : "fw+");
          }
       if( show_radar_data)
          exposure_config.min_alt = rdata.altitude_limit * 180. / PI;
@@ -2365,6 +2548,9 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
       double geo_posn[3], geo_vel[3];
       double delta_t;
       long rgb = 0;
+      double sum_r = 0., sum_r2 = 0.;     /* for uncertainty in r */
+      double sum_rv = 0., sum_rv2 = 0.;   /* for uncertainty in rvel */
+      double nominal_r = 0., nominal_rv = 0.;
 
       if( use_observation_times)
          {
@@ -2419,6 +2605,8 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
          double orbi_after_light_lag[MAX_N_PARAMS];
          OBSERVE temp_obs;
          int j;
+         const char *sigma_delta_placeholder = "!sigma_delta!";
+         const char *sigma_rvel_placeholder = "!sigma_rv!";
 
          integrate_orbit( orbi, prev_ephem_t, ephemeris_t);
          for( j = 0; j < 3; j++)
@@ -2486,6 +2674,15 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
             v_dot_r += topo[j] * topo_vel[j];
          r = vector3_length( topo);
          radial_vel = v_dot_r / r;
+         if( !obj_n)
+            {
+            nominal_r = r;
+            nominal_rv = radial_vel;
+            }
+         sum_r += r - nominal_r;
+         sum_r2 += (r - nominal_r) * (r - nominal_r);
+         sum_rv += radial_vel - nominal_rv;
+         sum_rv2 += (radial_vel - nominal_rv) * (radial_vel - nominal_rv);
          if( *stepsize == 'a')
             max_auto_step = fabs( atof( stepsize + 1)) * r / vector3_length( topo_vel);
          if( (ephem_type == OPTION_STATE_VECTOR_OUTPUT ||
@@ -2498,7 +2695,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
             int end_loc;
             const char *vect_opts = get_environment_ptr( "VECTOR_OPTS");
 
-            snprintf( buff, sizeof( buff), "%.5f", curr_jd);
+            snprintf_err( buff, sizeof( buff), "%.5f", curr_jd);
             sscanf( vect_opts, "%d,%lf,%lf%n",
                         &ecliptic_coords, &posn_mult, &tval, &end_loc);
             assert( tval);
@@ -2529,7 +2726,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                }
             for( j = 10, tval = posn_mult; tval > 1.2; j--)
                tval /= 10.;
-            snprintf( format_text, sizeof( format_text), "%%21.%df", j + 6);
+            snprintf_err( format_text, sizeof( format_text), "%%21.%df", j + 6);
             for( j = 0; j < 3; j++)
                snprintf_append( buff, sizeof( buff), format_text,
                                  topo[j] * posn_mult);
@@ -2538,7 +2735,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                strlcat_error( buff, " ");
                for( j = 12, tval = vel_mult; tval > 1.2; j--)
                   tval /= 10.;
-               snprintf( format_text, sizeof( format_text), "%%21.%df", j+5);
+               snprintf_err( format_text, sizeof( format_text), "%%21.%df", j+5);
                for( j = 0; j < 3; j++)
                   snprintf_append( buff, sizeof( buff), format_text,
                                  topo_vel[j] * vel_mult);
@@ -2586,7 +2783,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                       | FULL_CTIME_YEAR_FIRST | FULL_CTIME_MONTH_DAY
                       | FULL_CTIME_MONTHS_AS_DIGITS
                       | FULL_CTIME_LEADING_ZEROES);
-                  snprintf( buff, sizeof( buff), "Close approach at %s: ",
+                  snprintf_err( buff, sizeof( buff), "Close approach at %s: ",
                                  date_buff);
                   format_dist_in_buff( buff + strlen( buff), dist);
                   fprintf( ofile, "%s\n", buff);
@@ -2621,21 +2818,25 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
 
                   if( *offset_dir)
                      {
-                     char date_buff[80];
-                     static bool path_already_made = false;
+                     char date_buff[80], packed_buff[20];
 
                      strlcpy_error( tbuff, offset_dir);
-                     strlcat_error( tbuff, "/");
-                     if( !path_already_made)
-                        make_path_available( tbuff);
-                     path_already_made = true;
+                     text_search_and_replace( tbuff, "%p",
+                                 real_packed_desig( packed_buff, obs->packed_id));
+                     text_search_and_replace( tbuff, "%c", ephem_mpc_code);
                      full_ctime( date_buff, curr_jd,
                            FULL_CTIME_FORMAT_HH_MM | FULL_CTIME_YMD
                          | FULL_CTIME_MONTHS_AS_DIGITS | FULL_CTIME_NO_SPACES
                          | FULL_CTIME_NO_COLONS | FULL_CTIME_LEADING_ZEROES);
-                     strlcat_error( tbuff, date_buff);
-                     strlcat_error( tbuff, ".off");
+                     text_search_and_replace( tbuff, "%t", date_buff);
                      offset_ofile = fopen( tbuff, "wb");
+                     if( !offset_ofile)
+                        {
+                        make_path_available( tbuff);
+                        offset_ofile = fopen( tbuff, "wb");
+                        }
+                     if( !offset_ofile)
+                        debug_printf( "Couldn't open '%s'\n", tbuff);
                      assert( offset_ofile);
                      full_ctime( date_buff, curr_jd,
                             FULL_CTIME_FORMAT_HH_MM | FULL_CTIME_YMD);
@@ -2654,6 +2855,46 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                strlcat_error( buff, tbuff);
                snprintf_append( alt_buff, sizeof( alt_buff), " %8.3f %3d",
                                     dist * 3600. * 180. / PI, int_pa);
+               if( showing_delta_sigmas)
+                  {
+                  double sigma_r;
+                  char sigma_buff[20];
+
+                  sum_r /= (double)n_objects;
+                  sum_r2 /= (double)n_objects;
+                  sigma_r = sqrt( sum_r2 - sum_r * sum_r);
+                  alt_tptr = alt_buff + strlen( alt_buff);
+                  snprintf_err( sigma_buff, sizeof( sigma_buff), " %17.12f", sigma_r);
+                  text_search_and_replace( alt_buff, sigma_delta_placeholder,
+                                 sigma_buff);
+                  if( !computer_friendly)
+                     {
+
+                     use_au_only = (show_radar_data || (r > 999999. / AU_IN_KM));
+                     format_dist_in_buff( sigma_buff, sigma_r);
+                     use_au_only = false;
+                     }
+                  text_search_and_replace( buff, sigma_delta_placeholder,
+                                 sigma_buff);
+                  }
+               if( showing_rvel_sigmas)
+                  {
+                  double sigma_rv;
+                  char sigma_buff[20];
+
+                  sum_rv /= (double)n_objects;
+                  sum_rv2 /= (double)n_objects;
+                  sigma_rv = sqrt( sum_rv2 - sum_rv * sum_rv);
+                  sigma_rv *= AU_IN_KM / seconds_per_day;
+
+                  snprintf_err( sigma_buff, sizeof( sigma_buff),
+                                      " %11.6f", sigma_rv);
+                  text_search_and_replace( alt_buff, sigma_rvel_placeholder,
+                                 sigma_buff);
+                  format_velocity_in_buff( sigma_buff, sigma_rv);
+                  text_search_and_replace( buff, sigma_rvel_placeholder,
+                                 sigma_buff);
+                  }
                }
             if( !obj_n)
                {
@@ -2702,15 +2943,16 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                            vect[k] = -obs_posn_equatorial[k];
                      else
                         {           /* we want the lunar posn */
-                        double moon_dist, earth_loc[3], lunar_eclipse_mag;
+                        double moon_dist, lunar_eclipse_mag;
+                        double moon_loc[3], earth_loc[3];
                         const double lunar_radius = 1737.4 / AU_IN_KM;
 #ifdef SHOW_LUNAR_OFFSETS
                         double moon_lon, moon_lat, obs_lon, obs_lat;
                         char date_buff[80];
 #endif
 
-                        earth_lunar_posn( ephemeris_t, earth_loc, vect);
-                        lunar_eclipse_mag = lunar_eclipse_magnitude( earth_loc, vect);
+                        earth_lunar_posn( ephemeris_t, earth_loc, moon_loc);
+                        lunar_eclipse_mag = lunar_eclipse_magnitude( earth_loc, moon_loc);
                         if( lunar_eclipse_mag > -0.75 &&
                                        !*get_environment_ptr( "NO_LUNAR_ECLIPSES"))
                            {
@@ -2726,26 +2968,28 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                               lunar_eclipse_mag_drop = 9.;
                            }
                         for( k = 0; k < 3; k++)
-                           vect[k] -= obs_posn[k];
+                           vect[k] = moon_loc[k] - obs_posn[k];
+                        if( cinfo->planet == 10)    /* lunicentric viewpoint; */
+                           for( k = 0; k < 3; k++)  /* show earth elongs instead */
+                              vect[k] = earth_loc[k] - obs_posn[k];
                         moon_dist = vector3_length( vect);
 #ifdef SHOW_LUNAR_OFFSETS
                         moon_lon = atan2( vect[1], vect[0]);
                         moon_lat = asine( vect[2] / moon_dist);
 #endif
-                        if( moon_dist)
-                           cos_elong = dot_product( obs_posn, vect)
+                        cos_elong = dot_product( obs_posn, vect)
                                  / (vector3_length( obs_posn) * moon_dist);
-                        else     /* lunicentric ephems;  'lunar elong' is undefined */
-                           cos_elong = -1.;
                         lunar_elong = acose( -cos_elong);
                         ecliptic_to_equatorial( vect);   /* mpc_obs.cpp */
                         fraction_illum = shadow_check( earth_loc, orbi_after_light_lag,
                                     EARTH_RADIUS_IN_AU);
+                        fraction_illum *= shadow_check( moon_loc, orbi_after_light_lag,
+                                    LUNAR_RADIUS_IN_AU);
                         if( moon_dist)
                            cos_elong = dot_product( vect, topo)
                                         / (moon_dist * vector3_length( topo));
                         else
-                           cos_elong = 1.;
+                           cos_elong = -1.;
                         dist_moon = acose( cos_elong);
 
 #ifdef SHOW_LUNAR_OFFSETS
@@ -2762,7 +3006,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                               (obs_lon - moon_lon) * 180. / PI,
                               (obs_lat - moon_lat) * 180. / PI);
 #endif
-                        if( dist_moon < lunar_radius / moon_dist)
+                        if( moon_dist && dist_moon < lunar_radius / moon_dist)
                            visibility_char = (vector3_length( topo) < moon_dist ?
                                        'l' : 'L');  /* l=obj transits moon, */
                         }                           /* L=obj behind moon   */
@@ -2778,13 +3022,19 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                      }
                   temp_latlon.x = cinfo->lon;
                   temp_latlon.y = cinfo->lat;
-                  full_ra_dec_to_alt_az( &obj_ra_dec, &alt_az[j], NULL,
-                                 &temp_latlon, utc, &hour_angle[j]);
-                  full_ra_dec_to_alt_az( &obj_ra_dec, &best_alt_az[j], NULL,
-                                 &best_latlon, utc, NULL);
+                  ra_dec_to_alt_az_2( cinfo->planet, &obj_ra_dec, &alt_az[j], &temp_latlon,
+                                utc, &hour_angle[j]);
+                  ra_dec_to_alt_az_2( cinfo->planet, &obj_ra_dec, &best_alt_az[j], &best_latlon,
+                                utc, NULL);
                   alt_az[j].x = centralize_ang( alt_az[j].x + PI);
                   best_alt_az[j].x = centralize_ang( best_alt_az[j].x + PI);
                   }
+               if( is_geocentric && 3 != cinfo->planet)
+                  for( j = 0; j < 3; j++)
+                     {     /* haven't generalized locations for off-earth */
+                     best_alt_az[j].x = alt_az[j].x = 0.;
+                     best_alt_az[j].y = alt_az[j].y = (j ? -PI / 2. : PI / 2.);
+                     }
                if( is_under_horizon( alt_az[0].y * 180. / PI,
                                      alt_az[0].x * 180. / PI, &exposure_config))
                   {
@@ -2875,13 +3125,13 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   const char *mpc_code = (use_observation_times ?
                                  obs[i].mpc_code : note_text + 1);
 
-                  snprintf( fake_line, sizeof( fake_line),
+                  snprintf_err( fake_line, sizeof( fake_line),
                            " | |EphemOb|CCD|%.3s |", mpc_code);
                   iso_time( fake_line + strlen( fake_line), curr_jd, 6);
                   snprintf_append( fake_line, sizeof( fake_line),
                            "|%18.14f|%+18.14f", ra * 15, dec);
                   }
-               snprintf( alt_buff, sizeof( alt_buff), "%18.10f ", curr_jd);
+               snprintf_err( alt_buff, sizeof( alt_buff), "%17.9f ", curr_jd);
                if( computer_friendly)
                   strlcpy( buff, alt_buff, sizeof( buff));
                else
@@ -2922,6 +3172,11 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                      format_dist_in_buff( buff + strlen( buff), r);
                      use_au_only = false;
                      }
+                  if( showing_delta_sigmas)
+                     {
+                     strlcat_error( buff, sigma_delta_placeholder);
+                     strlcat_error( alt_buff, sigma_delta_placeholder);
+                     }
                   }
                if( !(options & OPTION_SUPPRESS_SOLAR_R))
                   {
@@ -2984,9 +3239,9 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   {
                   if( mags_per_arcsec2 > 99.9)
                      mags_per_arcsec2 = 99.99;
-                  snprintf( tbuff, sizeof( tbuff), " %5.2f", mags_per_arcsec2);
+                  snprintf_err( tbuff, sizeof( tbuff), " %5.2f", mags_per_arcsec2);
                   strlcat_error( alt_buff,
-                           (mags_per_arcsec2 > 99.9) ? " null" : tbuff);
+                           (mags_per_arcsec2 > 99.9) ? "  null" : tbuff);
                   snprintf_append( alt_buff, sizeof( alt_buff), " %06lx", rgb);
                   if( mags_per_arcsec2 > 99.9 && !computer_friendly)
                      strlcpy_error( tbuff, " --.--");
@@ -3035,7 +3290,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                                     curr_mag, (exp_time ? exp_time : 30.));
                      const char *fmt = (snr > 99. ? " %5.0f" : " %5.2f");
 
-                     snprintf( tbuff, sizeof( tbuff), fmt, snr);
+                     snprintf_err( tbuff, sizeof( tbuff), fmt, snr);
                      strlcat_error( buff, tbuff);
                      strlcat_error( alt_buff, tbuff);
                      }
@@ -3083,7 +3338,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
 
                *tbuff = '\0';
                if( options & OPTION_PHASE_ANGLE_OUTPUT)
-                  snprintf( tbuff, sizeof( tbuff), " %8.4f", phase_ang * 180. / PI);
+                  snprintf_err( tbuff, sizeof( tbuff), " %8.4f", phase_ang * 180. / PI);
 
 
                if( options & OPTION_PHASE_ANGLE_BISECTOR)
@@ -3169,12 +3424,16 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   {
                   double orbit_norm[3], unused_pa, dist;
                   DPT orbit_pole;
+                  bool is_retrograde;
 
                   vector_cross_product( orbit_norm, orbi, orbi + 3);
+                  is_retrograde = (orbit_norm[2] < 0.);
                   ecliptic_to_equatorial( orbit_norm);
                   vector_to_polar( &orbit_pole.x, &orbit_pole.y, orbit_norm);
                   calc_dist_and_posn_ang( &ra_dec.x, &orbit_pole.x,
                                         &dist, &unused_pa);
+                  if( is_retrograde)    /* odd convention : PlAng is +ive if */
+                     dist = PI - dist;  /* observer is 'above' the orbit plane */
                   snprintf_append( tbuff, sizeof( buff), " %7.3f",
                                     dist * 180. / PI - 90.);
                   }
@@ -3183,19 +3442,21 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                strlcat_error( alt_buff, tbuff);
                if( abs_mag)           /* don't show a mag if you dunno how bright */
                   {                   /* the object really is! */
-                  const bool two_place_mags =
-                                   (*get_environment_ptr( "MAG_DIGITS") == '2');
-
-                  if( two_place_mags)
+                  if( n_mag_places > 1)
                      {
-                     const char *fmt = (curr_mag > 99.8 ? " %5.1f" : " %5.2f");
-
-                     snprintf_append( buff, sizeof( buff), fmt, curr_mag + .005);
+                     char format[7];
+
+                     strlcpy_error( format, " %n.nf");
+                     format[2] = '3' + n_mag_places;
+                     format[4] = '0' + n_mag_places;
+                     if( curr_mag > 99.8)
+                        format[4]--;
+                     snprintf_append( buff, sizeof( buff), format, curr_mag);
                      }
                   else if( fraction_illum == 0.)
                      strlcat_error( buff, " Sha ");
                   else if( curr_mag < 99 && curr_mag > -9.9)
-                     snprintf_append( buff, sizeof( buff), " %4.1f", curr_mag + .05);
+                     snprintf_append( buff, sizeof( buff), " %4.1f", curr_mag);
                   else
                      snprintf_append( buff, sizeof( buff), " %3d ", (int)( curr_mag + .5));
                   if( phase_ang > PI * 2. / 3.)    /* over 120 degrees */
@@ -3208,7 +3469,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                         if( endptr[-2] == '.')
                            endptr[-2] = '?';
                         }
-                  snprintf_append( alt_buff, sizeof( alt_buff), " %6.3f", curr_mag + .0005);
+                  snprintf_append( alt_buff, sizeof( alt_buff), " %6.3f", curr_mag);
                   }
 
                if( options & OPTION_LUNAR_ELONGATION)
@@ -3230,8 +3491,8 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   compute_observation_motion_details( &temp_obs, &m);
                   if( options & OPTION_MOTION_OUTPUT)
                      {
-                     format_motion( end_ptr + 1, m.total_motion);
-                     snprintf( end_ptr + 9, 7, "%5.1f ",
+                     format_motion( end_ptr + 1, m.total_motion * motion_units);
+                     snprintf_err( end_ptr + 9, 7, "%5.1f ",
                                      m.position_angle_of_motion);
                      end_ptr[8] = end_ptr[0] = ' ';
                      snprintf_append( alt_buff, sizeof( alt_buff),
@@ -3243,8 +3504,8 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                      }
                   if( options & OPTION_SEPARATE_MOTIONS)
                      {
-                     format_motion( end_ptr + 1, m.ra_motion);
-                     format_motion( end_ptr + 9, m.dec_motion);
+                     format_motion( end_ptr + 1, m.ra_motion * motion_units);
+                     format_motion( end_ptr + 9, m.dec_motion * motion_units);
                      end_ptr[8] = end_ptr[0] = ' ';
                      snprintf_append( alt_buff, sizeof( alt_buff),
                                  " %f %f", m.ra_motion, m.dec_motion);
@@ -3275,7 +3536,7 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   *tbuff = '\0';
                   if( show_alt)
                      {
-                     snprintf( tbuff, sizeof( tbuff), " %c%02d",
+                     snprintf_err( tbuff, sizeof( tbuff), " %c%02d",
                                        (alt > 0. ? '+' : '-'),
                                        (int)( fabs( alt) + .5));
                      snprintf_append( alt_buff, sizeof( alt_buff), " %8.4f", alt);
@@ -3300,6 +3561,11 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
                   snprintf_append( alt_buff, sizeof( alt_buff),
                                       " %11.6f", rvel_in_km_per_sec);
                   format_velocity_in_buff( end_ptr, rvel_in_km_per_sec);
+                  if( showing_rvel_sigmas)
+                     {
+                     strlcat_error( buff, sigma_rvel_placeholder);
+                     strlcat_error( alt_buff, sigma_rvel_placeholder);
+                     }
                   }
                if( options & OPTION_SPACE_VEL_OUTPUT)
                   {
@@ -3348,11 +3614,11 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
 
                   alt_in_meters = find_lat_lon_alt( utc, geo, cinfo->planet, lat_lon,
                            *get_environment_ptr( "GEOMETRIC_GROUND_TRACK") == '1');
-                  snprintf( tbuff, 30, "%9.4f %+08.4f %10.3f",
+                  snprintf( tbuff, 31, "%9.4f %+08.4f %10.2f",
                         lat_lon[0] * 180. / PI,
                         lat_lon[1] * 180. / PI,
                         alt_in_meters / meters_per_km);
-                  tbuff[30] = '\0';
+                  tbuff[29] = '\0';
                   strlcat_error( alt_buff, tbuff);
                   strlcat_error( buff, tbuff);
                   }
@@ -3481,19 +3747,6 @@ static int _ephemeris_in_a_file( const char *filename, const double *orbit,
       }
    return( 0);
 }
-/* The above ephemeris code may insert a six-character hexadecimal
-color,  computed using sky background brightness data,  prefaced by
-'$'.  This should be removed before the line is shown to a user.
-The RGB value is returned,  and may (or may not) be made use of. */
-
-int remove_rgb_code( char *buff)
-{
-   unsigned rval = (unsigned)-1;
-
-   while( (buff = strchr( buff, '$')) && sscanf( buff + 1, "%06x", &rval) == 1)
-      memmove( buff, buff + 7, strlen( buff + 6));
-   return( (int)rval);
-}
 
 /* "is_topocentric_mpc_code( )" is taken to mean "can you compute alt/az
 ephems and/or visibility info from this station",  and is used in
@@ -3509,7 +3762,7 @@ bool is_topocentric_mpc_code( const char *mpc_code)
 
 static double get_telescope_primary_diameter( const char *mpc_code)
 {
-   FILE *ifile = fopen_ext( "details.txt", "fclrb");
+   FILE *ifile = fopen_ext( "details.txt", "fcrb");
    char buff[100];
    double rval = 0.;
    int in_code_section = 0;
@@ -3535,8 +3788,8 @@ static void get_scope_params( const char *mpc_code, expcalc_config_t *c)
    const char *scope_json_file = get_environment_ptr( "SCOPE_JSON_FILE");
    char filename[120];
 
-   snprintf( filename, sizeof( filename), "site_%.3s.txt", mpc_code);
-   ifile = fopen_ext( filename, "clrb");
+   snprintf_err( filename, sizeof( filename), "site_%.3s.txt", mpc_code);
+   ifile = fopen_ext( filename, "crb");
    if( ifile)
       {
       scope_details = find_expcalc_config_from_mpc_code( mpc_code, ifile, c);
@@ -3555,7 +3808,7 @@ static void get_scope_params( const char *mpc_code, expcalc_config_t *c)
       }
    if( scope_details == EXPCALC_NO_CONFIG_FOUND)
       {
-      ifile = fopen_ext( "scope.json", "fclrb");
+      ifile = fopen_ext( "scope.json", "fcrb");
       scope_details = find_expcalc_config_from_mpc_code( mpc_code, ifile, c);
       fclose( ifile);
       }
@@ -3586,7 +3839,7 @@ int ephemeris_in_a_file_from_mpc_code( const char *filename,
    assert( strlen( mpc_code) >= 3);
    get_observer_data( mpc_code, buff, &cinfo);
    strlcpy_error( ephem_mpc_code, mpc_code);
-   snprintf( note_text, sizeof( note_text),
+   snprintf_err( note_text, sizeof( note_text),
                     "(%s) %s", mpc_code, mpc_station_name( buff));
    get_object_name( buff, obs->packed_id);
    snprintf_append( note_text, sizeof( note_text), ": %s", buff);
@@ -3607,129 +3860,6 @@ int ephemeris_in_a_file_from_mpc_code( const char *filename,
    return( rval);
 }
 
-static int64_t ten_to_the_nth( int n)
-{
-   int64_t rval = 1;
-
-   while( n--)
-      rval *= 10;
-   return( rval);
-}
-
-/* See comments for get_ra_dec() in mpc_fmt.cpp for info on the meaning  */
-/* of 'precision' in this function.                                      */
-
-static void output_angle_to_buff( char *obuff, double angle, int precision)
-{
-   int n_digits_to_show = 0;
-   int64_t power_mul, fraction;
-   size_t i, full_len = 12;
-
-   if( (precision >= 100 && precision <= 116) /* decimal quantity, dd.dd... */
-        || ( precision >= 200 && precision <= 215)) /* decimal ddd.dd... */
-      {
-      const int two_digits = (precision <= 200);
-
-      n_digits_to_show = precision % 100;
-      power_mul = ten_to_the_nth( n_digits_to_show);
-      fraction = (int64_t)( angle * (two_digits ? 1. : 15.) * (double)power_mul + .5);
-
-      snprintf( obuff, 4, (two_digits ? "%02u" : "%03u"),
-                  (int)( fraction / power_mul));
-      fraction %= power_mul;
-      }
-   else
-      switch( precision)
-         {
-         case -1:       /* hh mm,  integer minutes */
-         case -2:       /* hh mm.m,  tenths of minutes */
-         case -3:       /* hh mm.mm,  hundredths of minutes */
-         case -4:       /* hh mm.mmm,  milliminutes */
-         case -5:       /* hh mm.mmmm */
-         case -6:       /* hh mm.mmmmm */
-         case -7:       /* hh mm.mmmmmm */
-            {
-            n_digits_to_show = -1 - precision;
-            power_mul = ten_to_the_nth( n_digits_to_show);
-            fraction = (int64_t)( angle * 60. * (double)power_mul + .5);
-            snprintf( obuff, 6, "%02u %02u", (unsigned)( fraction / ((int64_t)60 * power_mul)),
-                                         (unsigned)( fraction / power_mul) % 60);
-            fraction %= power_mul;
-            }
-            break;
-         case 0:        /* hh mm ss,  integer seconds */
-         case 1:        /* hh mm ss.s,  tenths of seconds */
-         case 2:        /* hh mm ss.ss,  hundredths of seconds */
-         case 3:        /* hh mm ss.sss,  thousands of seconds */
-         case 4: case 5: case 6:    /* possible extra digits in ephems */
-         case 7: case 8: case 9:
-         case 307:      /* hhmmsss,  all packed together:  tenths */
-         case 308:      /* hhmmssss,  all packed together: hundredths */
-         case 309:      /* milliseconds (or milliarcseconds) */
-         case 310:      /* formats 307-312 are the 'super-precise' formats */
-         case 311:
-         case 312:      /* microseconds (or microarcseconds) */
-         case 400:      /* (RA) ddd mm ss,  integer arcseconds */
-         case 401:      /* (RA) ddd mm ss.s,  tenths of arcseconds */
-         case 402:      /* (RA) ddd mm ss.ss,  centiarcsec */
-            {
-            const char *format = "%02u %02u %02u";
-
-            if( precision >= 400)
-               {
-               format = "%03u %02u %02u";
-               precision -= 400;
-               angle *= 15.;
-               }
-            n_digits_to_show = precision % 306;
-            power_mul = ten_to_the_nth( n_digits_to_show);
-            fraction = (int64_t)( angle * 3600. * (double)power_mul + .5);
-            snprintf( obuff, 10, format,
-                     (unsigned)( fraction / ((int64_t)3600 * power_mul)),
-                     (unsigned)( fraction / ((int64_t)60 * power_mul)) % 60,
-                     (unsigned)( fraction / power_mul) % 60);
-            fraction %= power_mul;
-            if( precision > 306)          /* remove spaces: */
-               text_search_and_replace( obuff, " ", "");
-            }
-            break;
-         default:                  /* try to show the angle,  but indicate */
-            if( angle > -1000. && angle < 1000.)   /* the format is weird  */
-               snprintf( obuff, 10, "?%.5f", angle);
-            else
-               strlcpy_error( obuff, "?");
-            fraction = 0;   /* not really necessary;  evades nuisance GCC warning */
-            break;
-         }
-                  /* Formats not used in astrometry -- they don't fit the */
-                  /* field size for punched-card data,  but are used in ephems */
-   if( precision >= 4 && precision <= 11)    /* 'overlong' dd mm ss.ssss... */
-      full_len += (size_t)( precision - 3);
-   if( precision >= 209 && precision <= 215) /* 'overlong' ddd.ddddd... */
-      full_len += (size_t)( precision - 208);
-   if( precision >= 110 && precision <= 116) /* 'overlong' dd.dddddd... */
-      full_len += (size_t)( precision - 109);
-   if( n_digits_to_show)
-      {
-      char format[8];
-
-      if( precision < 307 || precision > 312)   /* omit decimal point for */
-         strcat( obuff, ".");                    /* super-precise formats */
-      assert( n_digits_to_show > 0 && n_digits_to_show < 20);
-      snprintf_err( format, sizeof( format), "%%0%dld", n_digits_to_show);
-      snprintf_append( obuff, full_len + 1, format, (long)fraction);
-      }
-   for( i = strlen( obuff); i < full_len; i++)
-      obuff[i] = ' ';
-   obuff[full_len] = '\0';
-}
-
-static void output_signed_angle_to_buff( char *obuff, const double angle,
-                               const int precision)
-{
-   *obuff++ = (angle < 0. ? '-' : '+');
-   output_angle_to_buff( obuff, fabs( angle), precision);
-}
 
 /* 'put_residual_into_text( )' expresses a residual,  from 0 to 180 degrees, */
 /* such that the text starts with a space,  followed by four characters,   */
@@ -3760,17 +3890,16 @@ static void put_residual_into_text( char *text, const double resid,
 
    if( resid_format & RESIDUAL_FORMAT_COMPUTER_FRIENDLY)
       {                   /* resids in arcseconds at all times,  with */
-      if( resid > -9.9999 && resid < 9.9999)
-         snprintf_err( text, 11, " %+8.6f", resid);    /* some added precision */
+      snprintf( text, 11, " %+8.6f", resid);    /* some added precision */
       return;
       }
    if( zval > 999. * 3600.)      /* >999 degrees: error must have occurred */
       strlcpy_err( text, " Err!", 6);
    else if( zval > 59940.0)             /* >999': show integer degrees */
       snprintf_err( text, 6, "%4.0fd", zval / 3600.);
-   else if( zval > 9999.9)              /* 999' > x > 9999": show ###' arcmin */
+   else if( zval > 9999.)              /* 999' > x > 9999": show ###' arcmin */
       snprintf_err( text, 6, "%4.0f'", zval / 60.);
-   else if( zval > 99.9)
+   else if( zval > 99.)
       snprintf_err( text, 6, "%5.0f", zval);
    else if( zval > .99 && zval < 9.99 && precise)
       snprintf_err( text, 6, "%5.2f", zval);
@@ -3779,9 +3908,9 @@ static void put_residual_into_text( char *text, const double resid,
    else if( (resid_format & RESIDUAL_FORMAT_OVERPRECISE) && zval < .00999)
       {          /* 'high-precision' residuals */
       unsigned i;
-      const char *lower_si_prefixes = " munpfazy ";
+      const char *lower_si_prefixes = " munpfazyrq ";
 
-      for( i = 0; zval < 0.99 && i < 9; i++)
+      for( i = 0; zval < 0.99 && i < 11; i++)
          zval *= 1000.;
       snprintf_err( text, 6, (zval < 9.9 ? "%4.1f%c" : "%4.0f%c"),
                      zval, lower_si_prefixes[i]);
@@ -3890,6 +4019,34 @@ double utc_from_td( const double jdt, double *delta_t)
    return( utc);
 }
 
+/* The following two functions are used to get the 'original' RA/decs,
+i.e.,  those without debiasing applied,  as seen in the original ADES
+or 80-column data.   */
+
+double original_observed_ra( const OBSERVE *obs)
+{
+   extern int apply_debiasing;
+   double rval = obs->ra;
+
+   if( apply_debiasing)
+      rval += obs->ra_bias * PI / (180. * 3600. * cos( obs->dec));
+   if( rval < 0.)
+      rval += PI + PI;
+   if( rval > PI + PI)
+      rval -= PI + PI;
+   return( rval);
+}
+
+double original_observed_dec( const OBSERVE *obs)
+{
+   extern int apply_debiasing;
+   double rval = obs->dec;
+
+   if( apply_debiasing)
+      rval += obs->dec_bias * PI / (180. * 3600.);
+   return( rval);
+}
+
 /* format_observation( ) takes an observation and produces text for it,
    suitable for display on a console (findorb) or in a Windoze scroll
    box (FIND_ORB),  or for writing to a file.  */
@@ -3900,7 +4057,6 @@ void format_observation( const OBSERVE FAR *obs, char *text,
    double angle;
    char xresid[30], yresid[30];
    int i;
-   extern int apply_debiasing;
    const int base_format = (resid_format & 3);
    const int base_time_format = obs->time_precision / 10;
    const int n_time_digits = obs->time_precision % 10;
@@ -3925,12 +4081,13 @@ void format_observation( const OBSERVE FAR *obs, char *text,
             i = int_to_mutant_hex_char( year / 100);
             if( year < 0 || year > 6199)
                i = '!';
-            snprintf( text, 6, "%c%02u%02u",   /* show century letter, 2digit yr, mo */
+            snprintf_err( text, 6, "%c%02u%02u",   /* show century letter, 2digit yr, mo */
                     (char)i, (unsigned)( year % 100), (unsigned)month);
 
             if( base_time_format != 3)
                {
-               show_dd_hh_mm_ss_point_sss( text + 5, day, n_time_digits);
+               show_dd_hh_mm_ss_point_sss( text + 5, day,
+                           (obs->note2 == 'R' ? 0 : n_time_digits));
                text[7] = ':';
                text[10] = text[11];     /* Turn dd hh:mm:ss into dd:hhmmss. This */
                text[11] = text[12];     /* corresponds to the somewhat weird way */
@@ -3945,12 +4102,12 @@ void format_observation( const OBSERVE FAR *obs, char *text,
                   text[12] = text[13] = ' ';
                }
             else
-               snprintf( text + 5, 13, "%012.9f", day);
+               snprintf_err( text + 5, 13, "%012.9f", day);
             break;
          case 4:        /* M056336.641592653: MJD formats 40-49 */
          case 1:        /* 2456336.641592653: JD formats 10-49 */
             {
-            snprintf( text, 18, "%017.9f",
+            snprintf_err( text, 18, "%017.9f",
                            utc - (base_time_format == 4 ? 2400000.5 : 0.));
             if( base_time_format == 4)
                *text = 'M';
@@ -3960,9 +4117,9 @@ void format_observation( const OBSERVE FAR *obs, char *text,
             {
             assert( n_time_digits <= 6);
             if( four_digit_years)
-               snprintf( text, 9, "%04ld\t%02d\t", year, month);
+               snprintf_err( text, 9, "%04ld\t%02d\t", year, month);
             else
-               snprintf( text, 7, "%02d\t%02d\t", abs( (int)year % 100), month);
+               snprintf_err( text, 7, "%02d\t%02d\t", abs( (int)year % 100), month);
             text += strlen( text);
             switch( GET_RESID_TIME_FORMAT( resid_format))
                {
@@ -3979,7 +4136,7 @@ void format_observation( const OBSERVE FAR *obs, char *text,
                                                       "%08.5f ",
                                                       "%09.6f" };
 
-                  snprintf( text, 10, date_format_text[n_time_digits], day);
+                  snprintf_err( text, 10, date_format_text[n_time_digits], day);
                   }
                   break;
                }
@@ -3994,11 +4151,7 @@ void format_observation( const OBSERVE FAR *obs, char *text,
             text[i] = ' ';
       snprintf_append( text, 40, "\t%c\t%s\t",
                    (obs->is_included ? ' ' : 'X'), obs->mpc_code);
-      angle = obs->ra * 12. / PI;
-      if( apply_debiasing)
-         angle += obs->ra_bias / (3600. * 15. * cos( obs->dec));
-      angle = fmod( angle, 24.);
-      if( angle < 0.) angle += 24.;
+      angle = original_observed_ra( obs) * 12. / PI;
       output_angle_to_buff( text + strlen( text), angle, obs->ra_precision);
       strcat( text, (base_format == RESIDUAL_FORMAT_FULL_WITH_TABS) ?
                               "\t" : "\t ");
@@ -4007,7 +4160,7 @@ void format_observation( const OBSERVE FAR *obs, char *text,
       {
       if( four_digit_years)
          *text++ = int_to_mutant_hex_char( year / 100);
-      snprintf( text, 11, "%02u%02u%02u %s", (unsigned)abs( (int)year % 100),
+      snprintf_err( text, 11, "%02u%02u%02u %s", (unsigned)abs( (int)year % 100),
                   (unsigned)month, (unsigned)day, obs->mpc_code);
       }
    text += strlen( text);
@@ -4030,7 +4183,7 @@ void format_observation( const OBSERVE FAR *obs, char *text,
 
          if( fabs( time_resid_in_microseconds) < 999.)
             {
-            snprintf( xresid, sizeof( xresid), "%+05d ", (int)( time_resid_in_microseconds * 10.));
+            snprintf_err( xresid, sizeof( xresid), "%+05d ", (int)( time_resid_in_microseconds * 10.));
             xresid[5] = xresid[0];
             xresid[0] = ' ';
             }
@@ -4047,7 +4200,7 @@ void format_observation( const OBSERVE FAR *obs, char *text,
             show_resid_in_sigmas( yresid, resid_in_hz / rinfo.doppler_sigma);
          else if( fabs( resid_in_hz) < 999.)
             {
-            snprintf( yresid, sizeof( yresid), "%+05d ", (int)( resid_in_hz * 10.));
+            snprintf_err( yresid, sizeof( yresid), "%+05d ", (int)( resid_in_hz * 10.));
             yresid[5] = yresid[0];
             yresid[0] = ' ';
             }
@@ -4069,27 +4222,30 @@ void format_observation( const OBSERVE FAR *obs, char *text,
       const char sign = (m.time_residual < 0. ? '-' : '+');
 
       if( abs_time_resid < .00094)               /* show as " -.4ms " */
-         snprintf( xresid, sizeof( xresid), " %c.%01dms", sign,
+         snprintf_err( xresid, sizeof( xresid), " %c.%01dms", sign,
                      (int)( abs_time_resid * 10000. + .5));
       else if( abs_time_resid < .099)            /* show as " -47ms " */
-         snprintf( xresid, sizeof( xresid), " %c%02dms", sign,
+         snprintf_err( xresid, sizeof( xresid), " %c%02dms", sign,
                      (int)( abs_time_resid * 1000. + .5));
       else if( abs_time_resid < .994)            /* show as " +.31s " */
-         snprintf( xresid, sizeof( xresid), " %c.%02ds", sign,
+         snprintf_err( xresid, sizeof( xresid), " %c.%02ds", sign,
                      (int)( abs_time_resid * 100. + .5));
       else if( abs_time_resid < 9.9)             /* show as " -4.7s " */
-         snprintf( xresid, sizeof( xresid), " %+4.1fs", m.time_residual);
-      else if( abs_time_resid < 999.)            /* show as " -217s " */
-         snprintf( xresid, sizeof( xresid), " %c%03ds", sign,
-                     (int)( abs_time_resid + .5));
-      else if( abs_time_resid / 60. < 999.)      /* show as " +133m " */
-         snprintf( xresid, sizeof( xresid), " %c%03dm", sign,
-                     (int)( abs_time_resid / 60. + .5));
-      else if( abs_time_resid / 3600. < 9999.)   /* show as " +027h " */
-         snprintf( xresid, sizeof( xresid), " %c%03dh", sign,
-                     (int)( abs_time_resid / 3600. + .5));
-      else                                   /* Give up after 1000 hours; */
-         strcpy( xresid, " !!!! ");          /* show "it's a long time"   */
+         snprintf_err( xresid, sizeof( xresid), " %+4.1fs", m.time_residual);
+      else
+          {
+          strcpy( xresid, " !!!! ");          /* show "it's a long time"   */
+          for( i = 0; xresid[1] == '!' && i < 4; i++)
+              {
+              static const double divisors[4] = { 1., 60., 3600., 86400. };
+              static const char *units = "smhd";
+              const double scaled = abs_time_resid / divisors[i];
+
+              if( scaled < 999.)
+                  snprintf_err( xresid, sizeof( xresid), " %c%03d%c", sign,
+                        (int)( scaled + 0.5), units[i]);
+              }
+           }
       put_residual_into_text( yresid, m.cross_residual, resid_format);
       }
    else
@@ -4105,14 +4261,19 @@ void format_observation( const OBSERVE FAR *obs, char *text,
          show_resid_in_sigmas( yresid, resid2);
          }
       }
+   if( !obs->posn_sigma_theta)
+      {
+      if( obs->posn_sigma_1 > 900000.)    /* means 'no dec supplied;  RA-only observation' */
+         strcpy( yresid, " ---- ");
+      if( obs->posn_sigma_2 > 900000.)    /* means 'no RA supplied; dec-only observation' */
+         strcpy( xresid, " ---- ");
+      }
    if( base_format != RESIDUAL_FORMAT_SHORT)
       {
       const char *tab_separator =
              ((base_format == RESIDUAL_FORMAT_FULL_WITH_TABS) ? "\t" : "");
 
-      angle = obs->dec * 180. / PI;
-      if( apply_debiasing)
-         angle += obs->dec_bias / 3600.;
+      angle = original_observed_dec( obs) * 180. / PI;
       if( angle < 0.)
          {
          angle = -angle;
@@ -4218,24 +4379,67 @@ static void put_sigma( char *buff, const double val)
    char tbuff[15];
 
    if( val < 0.099)
-      snprintf( tbuff, sizeof( tbuff), "%2.0fm", val * 1000.);
+      snprintf_err( tbuff, sizeof( tbuff), "%2.0fm", val * 1000.);
    else if( val < 9.9)
       {
-      snprintf( tbuff, sizeof( tbuff), "%.2f", val);
+      snprintf_err( tbuff, sizeof( tbuff), "%.2f", val);
       if( *tbuff == '0')         /* skip leading zero */
-         memmove( tbuff, tbuff + 1, strlen( tbuff));
+         memmove_err( tbuff, tbuff + 1, strlen( tbuff), tbuff + sizeof( tbuff));
       }
    else if( val < 999.)
-      snprintf( tbuff, sizeof( tbuff), "%3.0f", val);
+      snprintf_err( tbuff, sizeof( tbuff), "%3.0f", val);
    else if( val < 60. * 99.)
-      snprintf( tbuff, sizeof( tbuff), "%2.0f'", val / 60.);
+      snprintf_err( tbuff, sizeof( tbuff), "%2.0f'", val / 60.);
    else if( val < 3600. * 99.)
-      snprintf( tbuff, sizeof( tbuff), "%2.0fd", val / 3600.);
+      snprintf_err( tbuff, sizeof( tbuff), "%2.0fd", val / 3600.);
    else
       strcpy( tbuff, "---");
    memcpy( buff, tbuff, 3);
 }
 
+/* Some explanation of what may be weird-looking stuff in the following two
+functions : uncorrelated astrometric uncertainties are stored with
+posn_sigma_1 = rmsDec,  posn_sigma_2 = rmsRA, posn_sigma_theta = 0.
+Correlated are stored with posn_sigma_1 = major axis of the uncertainty
+ellipse,  posn_sigma_2 = minor axis,  and a non-zero posn_sigma_theta.
+
+When showing 'elliptical' uncertainties to humans,  we show rmsRA x rmsDec
+(and no position angle) if they're uncorrelated,  and major axis x minor
+axis and the position angle if they are correlated.  Which unfortunately
+means that in the first case,  we show posn_sigma_2 followed by
+posn_sigma_1;  in the correlated case,  we swap them.   */
+
+int error_ellipse_to_ades_value( const double major, const double minor, const double angle,
+         double *sigma_ra, double *sigma_dec, double *correl);
+
+void create_sigma_hover_text( char *buff, const size_t buffsize,
+                     const OBSERVE FAR *obs)
+{
+   strlcpy_err( buff, obs->packed_id, buffsize);
+   text_search_and_replace( buff, " ", "");
+   if( obs->posn_sigma_1 != obs->posn_sigma_2)
+      {
+      const int pa_tenths = (int)( obs->posn_sigma_theta * 1800. / PI + 0.5);
+      const double sig1 = (pa_tenths ? obs->posn_sigma_1 : obs->posn_sigma_2);
+      const double sig2 = (pa_tenths ? obs->posn_sigma_2 : obs->posn_sigma_1);
+
+      snprintf_append( buff, buffsize, "\n%.4g x %.4g", sig1, sig2);
+      if( pa_tenths)
+         {
+         double sigma_ra, sigma_dec, correl;
+
+         snprintf_append( buff, buffsize, " at PA %d.%d",
+                     pa_tenths / 10, pa_tenths % 10);
+         error_ellipse_to_ades_value( obs->posn_sigma_2, obs->posn_sigma_1, obs->posn_sigma_theta,
+                           &sigma_ra, &sigma_dec, &correl);
+         snprintf_append( buff, buffsize, "\nrmsRA=%.4g rmsDec=%.4g correl=%.4g",
+                           sigma_ra, sigma_dec, correl);
+         }
+      }
+   else
+      snprintf_append( buff, buffsize, "\nSigma %.4g", obs->posn_sigma_1);
+}
+
 int sigmas_in_columns_57_to_65 = 0;
 
 void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
@@ -4245,12 +4449,6 @@ void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
    int mag_digits_to_erase = 0;
    OBSERVE tobs = *obs;
 
-   if( obs->note2 == 'R')     /* for radar obs,  we simply store the */
-      {                       /* original observation line           */
-      strlcpy_err( obuff, obs->second_line + 81, 81);
-      return;
-      }
-// set_obs_to_microday( &tobs);
    switch( GET_RESID_RA_DEC_FORMAT( residual_format))
       {
       case 0:           /* use same format as obs was reported in */
@@ -4276,19 +4474,30 @@ void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
    obuff[13] = obs->note1;
    obuff[14] = obs->note2;
    memcpy( obuff + 15, buff, 17);      /* date/time */
+   if( obs->note2 == 'R')         /* restore orig observation line */
+      {                           /* for everything past column 32 */
+      strlcpy_err( obuff + 32, obs->second_line + 81 + 32, 81 - 32);
+      return;
+      }
    memcpy( obuff + 32, buff + 24, 12);      /* RA */
    memcpy( obuff + 44, buff + 38, 13);      /* dec */
-   snprintf( obuff + 57, 24, "%13.2f%c%c%s%s", obs->obs_mag,
+   if( !obs->posn_sigma_theta)
+      {
+      if( obs->posn_sigma_1 > 900000.)    /* means 'no dec supplied;  RA-only observation' */
+         memset( obuff + 44, ' ', 13);
+      if( obs->posn_sigma_2 > 900000.)    /* means 'no RA supplied; dec-only observation' */
+         memset( obuff + 32, ' ', 12);
+      }
+   snprintf_err( obuff + 57, 24, "%13.2f%c%c%s%s", obs->obs_mag,
               obs->mag_band, obs->astrometric_net_code, obs->reference, obs->mpc_code);
    if( obs->obs_mag == BLANK_MAG)        /* no mag given;  clean out that value */
       mag_digits_to_erase = 5;
    else
       mag_digits_to_erase = 2 - obs->mag_precision;
    memset( obuff + 70 - mag_digits_to_erase, ' ', mag_digits_to_erase);
-   memcpy( obuff + 56, obs->columns_57_to_65, 9);
-   if( sigmas_in_columns_57_to_65 &&
-               !memcmp( obuff + 56, "         ", 9))
+   if( sigmas_in_columns_57_to_65)
       {
+      memset( obuff + 56, ' ', 9);
       if( obs->posn_sigma_1 == obs->posn_sigma_2)
          put_sigma( obuff + 59, obs->posn_sigma_1);
       else
@@ -4302,8 +4511,16 @@ void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
             }
          put_sigma( obuff + 57, obs->posn_sigma_1 * multiplier);
          put_sigma( obuff + 61, obs->posn_sigma_2 * multiplier);
+         if( !obs->posn_sigma_theta)
+            {
+            memcpy( buff, obuff + 57, 3);
+            memcpy( obuff + 57, obuff + 61, 3);
+            memcpy( obuff + 61, buff, 3);
+            }
          }
       }
+   else
+      memcpy( obuff + 56, obs->columns_57_to_65, 9);
    if( !obs->is_included)
       obuff[64] = 'x';
    if( obs->flags & OBS_DONT_USE)
@@ -4321,7 +4538,7 @@ void recreate_second_observation_line( char *buff, const OBSERVE FAR *obs)
       vect[i] = obs->obs_posn[j] - ?; (gotta get earths loc somewhere...)
    ecliptic_to_equatorial( vect);
    for( i = 0; i < 3; i++)
-      snprintf( buff + 33 + i * 12, 13, "%12.8f", vect[i]);
+      snprintf_err( buff + 33 + i * 12, 13, "%12.8f", vect[i]);
    buff[69] = ' ';
 }
 #endif
@@ -4347,7 +4564,7 @@ char *get_file_name( char *filename, const char *template_file_name)
       if( count > 5)
          count = 5;
       memcpy( filename, template_file_name, count);
-      snprintf( filename + count, 30, "%d%s", process_count, tptr);
+      snprintf_err( filename + count, 30, "%d%s", process_count, tptr);
       }
    return( filename);
 }
@@ -4369,7 +4586,7 @@ void create_obs_file( const OBSERVE FAR *obs, int n_obs, const int append,
       {
       char obuff[81];
 
-      snprintf( obuff, sizeof( obuff), "COM Posn sigma %g", obs->posn_sigma_1);
+      snprintf_err( obuff, sizeof( obuff), "COM Posn sigma %g", obs->posn_sigma_1);
       if( obs->posn_sigma_2 != obs->posn_sigma_1)  /* elliptical sigma */
          {
          snprintf_append( obuff, sizeof( obuff), " %g", obs->posn_sigma_2);
@@ -4424,6 +4641,10 @@ static void add_final_period( char *buff)
       strcat( buff, ".");
 }
 
+#define NAME_LIST_SIZE 300
+   /* size after adding 'Observers',  'Measurers',  &c */
+#define PADDED_NAME_LIST_SIZE 320
+
 static void tack_on_names( char *list, const char *names)
 {
    while( *names)
@@ -4439,7 +4660,7 @@ static void tack_on_names( char *list, const char *names)
             if( !memcmp( list + i, names, len))
                if( list[i + len] == ',' || !list[i + len])
                   already_in_list = 1;
-      if( !already_in_list)
+      if( !already_in_list && strlen( list) + len + 3 < NAME_LIST_SIZE)
          {
          char *lptr;
 
@@ -4508,7 +4729,7 @@ static int get_observer_details( const char *observation_filename,
       const char *mpc_code, const char *prog_codes,
       char *observers, char *measurers, char *scope)
 {
-   FILE *ifile = fopen_ext( observation_filename, "fclrb");
+   FILE *ifile = fopen_ext( observation_filename, "fcrb");
    char buff[700];
    const bool getting_observers = (*observers == '\0');
    const bool getting_measurers = (*measurers == '\0');
@@ -4528,8 +4749,10 @@ static int get_observer_details( const char *observation_filename,
 
                assert( tptr);
                *tptr = '\0';
-               jd_start = get_time_from_string( 0., buff + 10, 0, NULL);
-               jd_end = get_time_from_string( 0., tptr + 1, 0, NULL);
+               jd_start = get_time_from_string( 0., buff + 10,
+                           CALENDAR_JULIAN_GREGORIAN, NULL);
+               jd_end = get_time_from_string( 0., tptr + 1,
+                           CALENDAR_JULIAN_GREGORIAN, NULL);
                assert( jd_start > 2000000. && jd_start < 3000000.);
                assert( jd_end > 2000000. && jd_end < 3000000.);
                use_lines = got_obs_in_range( obs, n_obs, jd_start, jd_end);
@@ -4539,7 +4762,7 @@ static int get_observer_details( const char *observation_filename,
             if( use_lines && !memcmp( buff, "MEA ", 4) && getting_measurers)
                tack_on_names( measurers, buff + 4);
             if( use_lines && !memcmp( buff, "TEL ", 4) && getting_scopes)
-               strcat( scope, buff + 4);
+               strlcpy_err( scope, buff + 4, NAME_LIST_SIZE);
             if( !memcmp( buff, "COD ", 4))
                if( !get_details_from_here( buff, mpc_code, prog_codes))
                   new_code_found = true;
@@ -4577,14 +4800,16 @@ static void get_observer_details_from_obs( const OBSERVE *obs,
 
 static void observer_link_substitutions( char *buff)
 {
-   FILE *ifile = fopen_ext( "observer.txt", "fcrb");
+   FILE *ifile = fopen_ext( "observer.htm", "crb");
 
+   if( !ifile)
+      ifile = fopen_ext( "observer.txt", "fcrb");
    if( ifile)
       {
       char line[200], *loc;
 
       while( fgets_trimmed( line, sizeof( line), ifile))
-         if( *line != ';' && *line != '#')
+         if( *line == ' ')
             {
             line[REPLACEMENT_COLUMN - 1] = '\0';
             remove_trailing_cr_lf( line);
@@ -4606,51 +4831,57 @@ static void observer_link_substitutions( char *buff)
       }
 }
 
-static unsigned get_list_of_stations( const unsigned n_obs,
-               const OBSERVE FAR *obs_data, const unsigned max_n_stations,
-               char stations[][5])
+#define is_power_of_two( X)   (!((X) & ((X) - 1)))
+
+static char *get_list_of_stations( const unsigned n_obs,
+               const OBSERVE FAR *obs_data, unsigned *n_stations)
 {
-   unsigned n_stations = 0, i, j;
+   char *rval = (char *)malloc( 6);
 
-   for( i = 0; i < n_obs; i++)
+   *n_stations = 0;
+   for( unsigned i = 0; i < n_obs; i++)
       {
       int compare = 1;
+      unsigned j = 0;
 
-      j = 0;
-      while( j < n_stations &&
-             (compare = strcmp( obs_data[i].mpc_code, stations[j])) > 0)
+      while( j < *n_stations &&
+            (compare = strcmp( obs_data[i].mpc_code, rval + j * 6)) > 0)
          j++;
       if( compare)         /* got a new one */
          {
+         char *tptr;
+
          assert( strlen( obs_data[i].mpc_code) == 3);
-         memmove( stations + j + 1, stations + j, (n_stations - j)  * sizeof( stations[0]));
-         strlcpy( stations[j], obs_data[i].mpc_code, 4);
-         n_stations++;
-         assert( n_stations < max_n_stations);
+         if( is_power_of_two( *n_stations))
+            rval = (char *)realloc( rval, (2 * *n_stations + 1) * 6);
+         tptr = rval + j * 6;
+         memmove( tptr + 6, tptr, (*n_stations - j) * 6);
+         strlcpy( tptr, obs_data[i].mpc_code, 4);
+         (*n_stations)++;
          }
       }
-   return( n_stations);
+   return( rval);
 }
 
 static int write_observer_data_to_file( FILE *ofile, const char *ast_filename,
                  const int n_obs, const OBSERVE FAR *obs_data)
 {
-   unsigned n_stations = 0, i, j;
-   char stations[400][5];
+   unsigned n_stations, i, j;
+   char *stations;
 
    INTENTIONALLY_UNUSED_PARAMETER( ast_filename);
-   n_stations = get_list_of_stations( n_obs, obs_data, 400, stations);
+   stations = get_list_of_stations( n_obs, obs_data, &n_stations);
    for( i = 0; i < n_stations; i++)
       {
       char buff[200], tbuff[100];
-      char details[4][310];
+      char details[4][PADDED_NAME_LIST_SIZE];
       char program_codes[30];
       size_t loc, n_program_codes = 0;
       const char *allowable_codes = "0123456789!\"#$%&'()*+,-./[\\]^_`{|}~";
 
       *program_codes = '\0';
       for( j = 0; j < (unsigned)n_obs; j++)
-         if( !strcmp( stations[i], obs_data[j].mpc_code)
+         if( !strcmp( stations + i * 6, obs_data[j].mpc_code)
                && strchr( allowable_codes, obs_data[j].note1)
                && !strchr( program_codes, obs_data[j].note1))
              {
@@ -4658,7 +4889,7 @@ static int write_observer_data_to_file( FILE *ofile, const char *ast_filename,
              program_codes[n_program_codes] = '\0';
              }
 
-      strlcpy_error( tbuff, stations[i]);
+      strlcpy_error( tbuff, stations + i * 6);
       put_observer_data_in_text( tbuff, buff);
       snprintf_err( details[0], sizeof( details[0]), "(%s) %s.", tbuff, buff);
 
@@ -4670,7 +4901,7 @@ static int write_observer_data_to_file( FILE *ofile, const char *ast_filename,
             const char *filenames[3] = { "progcode.txt", "details.txt", "scopes.txt" };
 
             get_observer_details( filenames[j], obs_data,
-                      n_obs, stations[i], program_codes, details[1], details[2], details[3]);
+                      n_obs, stations + i * 6, program_codes, details[1], details[2], details[3]);
             }
       for( j = 1; j <= 3; j++)
          add_final_period( details[j]);
@@ -4723,6 +4954,7 @@ static int write_observer_data_to_file( FILE *ofile, const char *ast_filename,
             }
       fprintf( ofile, "\n");
       }
+   free( stations);
    return( 0);
 }
 
@@ -4739,16 +4971,28 @@ int write_residuals_to_file( const char *filename, const char *ast_filename,
       {
       char buff[200];
       int number_lines = (n_obs + 2) / 3;
-      int i;
+      int i, line_to_show;
 
+      if( resid_format & RESIDUAL_FORMAT_NORMALIZED)
+         line_to_show = 2105;
+      else if( resid_format & RESIDUAL_FORMAT_TIME_RESIDS)
+         line_to_show = 2104;
+      else
+         line_to_show = 2103;
+
+      fprintf( ofile, "%s\n", get_find_orb_text( line_to_show));
       if( (resid_format & 3) == RESIDUAL_FORMAT_SHORT)
          for( i = 0; i < number_lines * 3; i++)
             {
             int num = (i % 3) * number_lines + i / 3;
-            OBSERVE FAR *obs = ((OBSERVE FAR *)obs_data) + num;
+            const OBSERVE FAR *obs = obs_data + num;
 
             if( num < n_obs)
+               {
                format_observation( obs, buff, resid_format);
+               if( obs->reference[0] == '!' && obs->reference[1] == '!')
+                  memcpy( buff, "------ --- ----- -----", 22);
+               }
             else
                *buff = '\0';
             fprintf( ofile, "%s%s", buff, (i % 3 == 2) ? "\n" : "   ");
@@ -4803,16 +5047,18 @@ void remove_trailing_cr_lf( char *buff)
    buff[i] = '\0';
 }
 
-/* MPC frowns upon redistribution of NEOCP astrometry.  So if an input
-line is from NEOCP,  it's blacked out,  _unless_ it's from a station
-that has given permission for republication.  Those stations are listed
-in the GREENLIT and GREENLIT2 lines in 'environ.dat';  you can add your
-own if desired.
+/* Until late 2023,  MPC frowned upon redistribution of NEOCP astrometry.
+ So if an input line was from NEOCP,  it was blacked out,  _unless_ it
+was from a station that had given permission for republication.
+'is_greenlit()' would determine if an observation could be distributed;
+if not,  the observation would be shown redacted.
 
-In some cases,  only heliocentric observations have gotten the green light.
-Those codes are followed by an asterisk in the GREENLIT/GREENLIT2 lines.
+   Post-2023,  the logic is different.  I sometimes receive data from
+people who say : feel free to distribute ephems based on this,  but we
+aren't ready to make the data public.  (Not often,  but it does happen.)
+Others will say : don't make data on artificial satellites public.
 
-For private use,  you can turn NEOCP redaction off... just be sure that
+For private use,  you can turn redaction off.  Just be sure that
 if you do that,  you don't redistribute anything.        */
 
 bool neocp_redaction_turned_on = true;
@@ -4822,64 +5068,62 @@ static bool is_neocp_line( const char *mpc_line)
    return( strlen( mpc_line) == 80 && !memcmp( mpc_line + 72, "NEOCP", 5));
 }
 
-static bool _is_greenlit( const char *env_line, const char *mpc_line,
+static bool _is_redacted( const char *env_line, const char *mpc_line,
                                                 const bool is_heliocentric)
 {
-   while( NULL != (env_line = strstr( env_line, mpc_line + 77)))
-      {
-      env_line += 3;
-      if( *env_line == ':')      /* specific program code */
+   const char *tptr = env_line;
+
+   while( NULL != (tptr = strstr( tptr, mpc_line + 77)))
+      if( tptr != env_line && tptr[-1] != ' ')
+         tptr += 3;     /* didn't actually find the code */
+      else
          {
-         if( env_line[1] == mpc_line[13])      /* yup,  right program code */
-            if( is_heliocentric || env_line[2] != '*')
+         tptr += 3;
+         if( *tptr == '*' && !is_heliocentric)
+            return( true);   /* only geocentric objects are redacted for this code */
+         if( *tptr <= ' ')      /* anything from this obscode is redacted */
+            return( true);
+         assert( *tptr == ':' || *tptr == '*');
+         tptr++;
+         while( *tptr > ' ')
+            {
+            if( *tptr == mpc_line[13])      /* yup,  right program code */
                return( true);
+            tptr++;
+            }
+         return( false);      /* didn't find that program code */
          }
-      else                 /* anything from this obscode */
-         if( is_heliocentric || *env_line != '*')
-            return( true);
-      }
    return( false);
 }
 
 static bool line_must_be_redacted( const char *mpc_line,
                                                 const bool is_heliocentric)
 {
-   if( is_neocp_line( mpc_line) && neocp_redaction_turned_on)
+   if( neocp_redaction_turned_on)
       {
-      const char *to_check[4] = { "GREENLIT", "GREENLIT2", "GREENLIT3", "GREENLIT4" };
       size_t i;
 
-      for( i = 0; i < 4; i++)
-         if( _is_greenlit( get_environment_ptr( to_check[i]), mpc_line, is_heliocentric))
-            return( false);
-      return( true);
-      }
-   else
-      return( false);
-}
-
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr)
-{
-   size_t ilen = FSTRLEN( str), rval = 0;
-   const size_t oldlen = strlen( oldstr);
-   const size_t newlen = strlen( newstr);
-
-   while( ilen >= oldlen)
-      if( !FMEMCMP( str, oldstr, oldlen))
+      if( mpc_line[72] == '!')      /* line is marked as 'private communication' */
+         return( true);
+      for( i = 0; i < 10; i++)
          {
-         FMEMMOVE( str + newlen, str + oldlen, ilen - oldlen + 1);
-         FMEMCPY( str, newstr, newlen);
-         str += newlen;
-         ilen -= oldlen;
-         rval++;
-         }
-      else
-         {
-         str++;
-         ilen--;
+         char env_buff[10];
+         const char *env_ptr;
+
+         strlcpy_error( env_buff, "REDACTED");
+         if( i)
+            {
+            env_buff[8] = (char)( '1' + i);
+            env_buff[9] = '\0';
+            }
+         env_ptr = get_environment_ptr( env_buff);
+         if( _is_redacted( env_ptr,  mpc_line, is_heliocentric))
+            return( true);
+         if( !*env_ptr)
+            break;
          }
-   return( (int)rval);
+      }
+   return( false);
 }
 
 static long round_off( const double ival, const double prec)
@@ -4953,6 +5197,44 @@ static inline void redacted_locations( const char *terms[],
          y[i] = -9;
 }
 
+/* The following will look through text and add HTML tags for HTTP and
+HTTPS links.  For example,  if the input buffer is
+
+Go to https://example.com/z.htm for details
+
+   the output will be
+
+Go to <a href='https://example.com/z.htm'>https://example.com/z.htm</a> for details
+*/
+
+static void _insert_links( char *buff, size_t buffsize)
+{
+   while( buffsize && *buff)
+      {
+      if( memcmp( buff, "http", 4))
+         {
+         buff++;
+         buffsize--;
+         }
+      else
+         {
+         size_t len = 0, slen = strlen( buff);
+
+         while( len < buffsize && buff[len] >= ' ' && buff[len] != '<')
+            len++;
+         assert( slen + 15 + len < buffsize);
+         memmove( buff + 15 + len, buff, slen + 1);
+         memcpy( buff + len + 11, buff, len);
+         memmove( buff + 9, buff, len);
+         memcpy( buff, "<a href='", 9);
+         memcpy( buff + len + 9, "'>", 2);
+         memcpy( buff + len * 2 + 11, "</A>", 4);
+         buff += 15 + len * 2;
+         buffsize -= 15 + len * 2;
+         }
+      }
+}
+
 char *mpec_error_message = NULL;
 
 void size_from_h_text( const double abs_mag, char *obuff, const int obuff_size)
@@ -5006,11 +5288,12 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
             orbit_is_heliocentric = false;
       }
 
+   residuals_ifile = fopen_ext( get_file_name( buff, residual_filename), "tfcrb");
    if( mpec_no)
-      snprintf( mpec_buff, 4, "_%02x", mpec_no % 256);
+      snprintf_err( mpec_buff, 4, "_%02x", mpec_no % 256);
    else
       *mpec_buff = '\0';
-   snprintf( buff, 12, "%cheader.htm", findorb_language);
+   snprintf_err( buff, 12, "%cheader.htm", findorb_language);
    header_htm_ifile = fopen_ext( buff, "crb");
    if( !header_htm_ifile)
       header_htm_ifile = fopen_ext( buff + 1, "fcrb");
@@ -5021,9 +5304,9 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
 
                   /* Count number of redacted and (current) NEOCP lines : */
    while( fgets_trimmed( buff, sizeof( buff), observations_ifile))
-      if( is_neocp_line( buff))
+      if( memcmp( buff, "COM ", 4))      /* skip comment/'sigma' lines */
          {
-         if( memcmp( buff + 56, "Removed", 7))
+         if( is_neocp_line( buff) && memcmp( buff + 56, "Removed", 7))
             n_neocp_lines++;
          if( line_must_be_redacted( buff, orbit_is_heliocentric))
             n_redacted_lines++;
@@ -5051,6 +5334,7 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
                   strlcpy_error( buff, "<p> <b>");
                   strlcat_error( buff, mpec_error_message);
                   strlcat_error( buff, "</b> </p>");
+                  _insert_links( buff, sizeof( buff));
                   }
                }
             while( (tptr = strchr( buff, '$')) != NULL && found_replacement_text)
@@ -5082,12 +5366,17 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
                         strlcpy_error( replace_str, obj_name);
                         found_replacement_text = true;
                         }
+                     else if( !strcmp( search_str, "$ResTy"))
+                        {
+                        fgets_trimmed( replace_str, sizeof( replace_str), residuals_ifile);
+                        found_replacement_text = true;
+                        }
                      else if( !strcmp( search_str, "$SV"))   /* state vect */
                         {                           /* for Orbit Simulator */
                         extern double helio_ecliptic_j2000_vect[];
                         const int n_output = (helio_ecliptic_j2000_vect[7] == 0.15 ? 8 : 6);
 
-                        snprintf( replace_str, sizeof( replace_str),
+                        snprintf_err( replace_str, sizeof( replace_str),
                                         "%s,%.2f", obj_name,
                                         helio_ecliptic_j2000_vect[8]);
                         text_search_and_replace( replace_str, " ", "%20");
@@ -5141,7 +5430,7 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
 
    if( mpec_no)
       {
-      snprintf( buff, 4, "%u", mpec_no % 255 + 1);
+      snprintf_err( buff, 4, "%u", mpec_no % 255 + 1);
       set_environment_ptr( "MPEC", buff);
       }
 
@@ -5161,19 +5450,26 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
 //          else
                {
                char mpc_code[8];
+               const bool omitted = (buff[72] == '!' && buff[73] == '!');
                const bool redacted = line_must_be_redacted( buff,
                                              orbit_is_heliocentric);
 
-               strlcpy_error( mpc_code, buff + 77);
+               if( omitted)
+                  strcpy( mpc_code, "   ");
+               else
+                  strlcpy_error( mpc_code, buff + 77);
                buff[77] = '\0';
                if( buff[14] != 's' && buff[14] != 'v' && buff[14] != 'r')
                   total_lines++;
-               fprintf( ofile, "<a name=\"o%s%03d\"></a><a href=\"#r%s%03d\">%.12s</a>",
+               if( omitted)
+                  fprintf( ofile, "            ");
+               else
+                  fprintf( ofile, "<a name=\"o%s%03d\"></a><a href=\"#r%s%03d\">%.12s</a>",
                         mpec_buff, total_lines, mpec_buff, total_lines, buff);
                if( redacted)
                   {
                   int i;
-                  const size_t start_of_redacted_text = 25;
+                  const size_t start_of_redacted_text = (omitted ? 12 : 25);
                   const size_t length_of_redacted_text = 77 - start_of_redacted_text;
                   char *tptr = buff + start_of_redacted_text;
 
@@ -5218,7 +5514,6 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
       fclose( observations_ifile);
       }
 
-   residuals_ifile = fopen_ext( get_file_name( buff, residual_filename), "tfcrb");
    if( residuals_ifile)
       {
       FILE *obslinks_file = fopen_ext( "obslinks.htm", "fcrb");
@@ -5279,18 +5574,18 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
 
 /*          if( compare)         */
                {
-               char text_to_find[50], *tptr;
+               char text_to_find[50], *break_ptr;
 
-               snprintf( text_to_find, sizeof( text_to_find),
+               snprintf_err( text_to_find, sizeof( text_to_find),
                                   "></a> %.3s  <", buff + 1);
                url[19] = '\0';
                fseek( obslinks_file, obslinks_header_len, SEEK_SET);
                while( (compare = memcmp( url + 13, text_to_find, 12)) != 0 &&
                                  fgets_trimmed( url, sizeof( url), obslinks_file))
                   ;
-               tptr = strstr( url, "<br>");
-               if( tptr)
-                  *tptr = '\0';
+               break_ptr = strstr( url, "<br>");
+               if( break_ptr)
+                  *break_ptr = '\0';
                url_index = 23;   /* if there is a link,  it starts in byte 23 */
                }
             if( compare)   /* still don't have URL;  try ObsLinks.html */
@@ -5403,10 +5698,10 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
    if( residuals_ifile)
       {
       fseek( residuals_ifile, 0L, SEEK_SET);
-      fprintf( ofile, "<pre><b><a name=\"residuals%s\"></a>"
-                      "<a href=\"%s#resids\">"
-                      "Residuals in arcseconds:</a> </b>\n",
-                           mpec_buff, explanations_url);
+      if( fgets_trimmed( buff, sizeof( buff), residuals_ifile))
+         fprintf( ofile, "<pre><b><a name=\"residuals%s\"></a>"
+                      "<a href=\"%s#resids\">%s:</a> </b>\n",
+                           mpec_buff, explanations_url, buff);
       line_no = 0;
       while( fgets( buff, sizeof( buff), residuals_ifile) && *buff > ' ')
          {
@@ -5466,10 +5761,12 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
                format = "<a class=\"whtext\" style=\"background-color:#%06x;\">";
             else           /* bright color:  normal (black) text  */
                format = "<a style=\"background-color:#%06x;\">";
-            memmove( color + 1, color + 7, strlen( color + 6));  /* remove RGB */
-            memmove( color + 8, color + 4, strlen( color + 9));
+            color[1] = color[7];       /* move the visibility indicator */
+            color[2] = color[8];
+            color[3] = color[9];
             memcpy( color + 4, "</a>", 4);                 /* insert end tag */
-            snprintf( replace, sizeof( replace), format, rgb);
+            memmove( color + 8, color + 10, strlen( color + 9));
+            snprintf_err( replace, sizeof( replace), format, rgb);
             text_search_and_replace( color, "$", replace);
             }
          fputs( buff, ofile);
@@ -5483,4 +5780,3 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name)
    fclose( ofile);
    return( rval);
 }
-
diff --git a/errors.cpp b/errors.cpp
index 90cfec4a..0dd956ee 100644
--- a/errors.cpp
+++ b/errors.cpp
@@ -154,9 +154,9 @@ of the following.)
    ...i.e.,  we have reduced it to a new quadratic form/covariance matrix.
 */
 
-void adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
+int adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
          double *angle, const double vx, const double vy);   /* errors.cpp */
-void convert_ades_sigmas_to_error_ellipse( const double sig_ra,
+int convert_ades_sigmas_to_error_ellipse( const double sig_ra,
          const double sig_dec, const double correl, double *major,
          double *minor, double *angle);                      /* errors.cpp */
 
@@ -168,6 +168,7 @@ static void adjust_quadratic_form_for_timing_error( const double A,
    const double Fx = A * vx + B * vy;
    const double Fy = C * vy + B * vx;
 
+   assert( E);
    *A1 = A - Fx * Fx / E;
    *B1 = B - Fx * Fy / E;
    *C1 = C - Fy * Fy / E;
@@ -199,28 +200,33 @@ precision problems that can crop up when you're taking the difference of
 two similar quantities.  (Though it may not avoid such problems,  if
 AC is close to B^2.... not much we can do about that,  though.)  */
 
-static void convert_quadratic_form_to_error_ellipse( const double A,
+static int convert_quadratic_form_to_error_ellipse( const double A,
          const double B, const double C, double *a, double *b,
          double *angle)
 {
-   const double tval = sqrt( (A - C) * (A - C) + 4. * B * B);
+   const double tval_squared = (A - C) * (A - C) + 4. * B * B;
+   const double tval = sqrt( tval_squared);
    const double eigenval2 = (A + C - tval) * .5;
    const double eigenval1 = (A * C - B * B) / eigenval2;
 
 #ifdef TEST_CODE
    printf( "Eigenvals %f %f\n", eigenval1, eigenval2);
 #endif          /* #ifdef TEST_CODE */
-   assert( eigenval1 < 0.);
-   assert( eigenval2 < 0.);
+   if( eigenval1 >= 0. || eigenval2 >= 0. || tval_squared < 0.)
+      {
+      *a = *b = *angle = 0.;
+      return( -1);
+      }
    *a = 1. / sqrt( -eigenval1);
    *b = 1. / sqrt( -eigenval2);
    *angle = atan2( eigenval1 - A, B);
+   return( 0);
 }
 
 /* ADES gives uncertainties in RA and dec,  plus their correlation
 (between -1 and +1).  That becomes the correlation matrix
 
-/ a  b \    a = -sig_ra^2     b = -correl * sig_ra * sig_dec
+/ a  b \    a = -sig_ra^2     b = correl * sig_ra * sig_dec
 |      |
 \ b  c /    c = -sig_dec^2
 
@@ -234,19 +240,55 @@ matrix,
    and we can feed said quadratic form through the above function
 to get the error ellipse,  which is what Find_Orb actually wants. */
 
-void convert_ades_sigmas_to_error_ellipse( const double sig_ra,
+int convert_ades_sigmas_to_error_ellipse( const double sig_ra,
          const double sig_dec, const double correl, double *major,
          double *minor, double *angle)
 {
    const double a = -sig_ra * sig_ra;
-   const double b = -sig_ra * sig_dec * correl;
+   const double b =  sig_ra * sig_dec * correl;
    const double c = -sig_dec * sig_dec;
    const double det = a * c - b * b;
-   const double A = c / det;
-   const double B = b / det;
-   const double C = a / det;
 
-   convert_quadratic_form_to_error_ellipse( A, B, C, major, minor, angle);
+   if( !det || isnan( det) || sig_ra <= 0. || sig_dec <= 0.
+               || correl >= 1. || correl <= -1.)
+
+      {                             /* should never happen;  indicates */
+      *major = sqrt( -a - c);       /* non-physical uncertainties */
+      *minor = 0.;
+      *angle = 0.;
+      return( -2);
+      }
+   else
+      {
+      const double A = c / det;
+      const double B = b / det;
+      const double C = a / det;
+
+      return( convert_quadratic_form_to_error_ellipse( A, B, C, major, minor, angle));
+      }
+}
+
+/* Mostly,  Find_Orb works with the error ellipse.  It is converted back to the
+ADES form (sigRA, sigDec, correl) for testing purposes and for output to ADES,
+using the following function.  */
+
+int error_ellipse_to_ades_value( const double major, const double minor, const double angle,
+         double *sigma_ra, double *sigma_dec, double *correl)
+{
+   double A, B, C;
+   double a, b, c, determ;
+
+   convert_error_ellipse_to_quadratic_form( major, minor, angle, &A, &B, &C);
+   determ = A * C - B * B;
+   if( determ <= 0. || A >= 0. || C >= 0.)
+      return( -1);
+   a = C / determ;
+   b = B / determ;
+   c = A / determ;
+   *sigma_ra = sqrt( -a);
+   *sigma_dec = sqrt( -c);
+   *correl = -b / (*sigma_ra * *sigma_dec);
+   return( 0);
 }
 
 /* adjust_error_ellipse_for_timing_error( ) puts the above pieces
@@ -254,33 +296,45 @@ together : given the estimated error ellipse and the uncertainty
 vector from timing,  it computes an adjusted error ellipse "stretched
 out" in the direction of motion.   */
 
-void adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
+int adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
          double *angle, const double vx, const double vy)
 {
    double A, B, C;
    double A1, B1, C1;
 
+   if( *sigma_a <= 0. || *sigma_b <= 0.)      /* non-physical ellipse; */
+      return( -2);                            /* leave it alone */
+
    convert_error_ellipse_to_quadratic_form( *sigma_a,
                *sigma_b, *angle, &A, &B, &C);
 
    adjust_quadratic_form_for_timing_error( A, B, C, vx, vy,
                   &A1, &B1, &C1);
-   convert_quadratic_form_to_error_ellipse( A1, B1, C1,
-                 sigma_a, sigma_b, angle);
+   return( convert_quadratic_form_to_error_ellipse( A1, B1, C1,
+                 sigma_a, sigma_b, angle));
 }
 
-
 #ifdef TEST_CODE
+
+/*  To compile the test code :
+
+cc -Wall -Wextra -pedantic -DTEST_CODE -o errors errors.cpp -lm      */
+
 int main( const int argc, const char **argv)
 {
    const double sigma_a = atof( argv[1]);
    const double sigma_b = atof( argv[2]);
    const double theta = atof( argv[3]) * PI / 180.;
    double A, B, C, a, b, angle;
+   double sigma_ra, sigma_dec, correl;
 
    convert_error_ellipse_to_quadratic_form( sigma_a,
                sigma_b, theta, &A, &B, &C);
    printf( "Quad form: %f %f %f\n", A, B, C);
+   error_ellipse_to_ades_value( sigma_a, sigma_b, theta,
+                  &sigma_ra, &sigma_dec, &correl);
+   printf( "In ADES form: sigRA = %f, sigDec = %f, correl = %f\n",
+               sigma_ra, sigma_dec, correl);
    convert_quadratic_form_to_error_ellipse( A, B, C,
                &a, &b, &angle);
    printf( "Converted back: %f %f at angle %f\n",
diff --git a/expcalc.cpp b/expcalc.cpp
index 1f9376b4..dd9a16b2 100644
--- a/expcalc.cpp
+++ b/expcalc.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <assert.h>
+#include "assert2.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
@@ -229,6 +229,7 @@ static int find_filter( expcalc_internals_t *e, char filter)
          e->extinction = filters[i].extinction;
          return( 0);
          }
+   assert( 0);       /* we _have_ to find a filter */
    return( -1);
 }
 
@@ -236,6 +237,12 @@ static int set_internals( expcalc_internals_t *e, const expcalc_config_t *c)
 {
    if( find_filter( e, c->filter))
       return( EXPCALC_UNKNOWN_FILTER);
+   assert( c->aperture > 0.1 && c->aperture < 100.);
+   assert( c->pixel_size > 0.01 && c->pixel_size < 100.);
+   assert( c->readnoise > 0.);
+   assert( c->primary_diam > 1.0 && c->primary_diam < 3100.);
+   assert( c->obstruction_diam >= 0.0 && c->obstruction_diam < c->primary_diam);
+   assert( c->qe > 0.01 && c->qe <= 1.0);
    e->n_pixels_in_aperture = pi * c->aperture * c->aperture
                   / (c->pixel_size * c->pixel_size);
    e->noise2 = c->readnoise * c->readnoise;
diff --git a/findorb.cpp b/findorb.cpp
index e5e17644..10eff86c 100644
--- a/findorb.cpp
+++ b/findorb.cpp
@@ -19,10 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #define _XOPEN_SOURCE_EXTENDED   1
 #define PDC_NCMOUSE
-#ifndef __WATCOMC__
-   #define PDC_FORCE_UTF8
-#endif
-#define MOUSE_MOVEMENT_EVENTS_ENABLED
+#define PDC_FORCE_UTF8
 
 #ifdef _WIN32
 #include <windows.h>
@@ -76,6 +73,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    #define MOUSE_WHEEL_SCROLL 0
 #endif
 
+#define CSI "\x1b["
+#define OSC "\x1b]"
+
 #define default_mouse_events (BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED \
                             | BUTTON2_CLICKED | BUTTON2_DOUBLE_CLICKED \
                             | BUTTON3_CLICKED | BUTTON3_DOUBLE_CLICKED \
@@ -112,9 +112,12 @@ int debug_level = 0;
 
 extern unsigned perturbers;
 
-#define AUTO_REPEATING         31002
-#define KEY_ADD_MENU_LINE      31004
-#define KEY_REMOVE_MENU_LINE   31005
+#define AUTO_REPEATING                31002
+#define KEY_ADD_MENU_LINE             31004
+#define KEY_REMOVE_MENU_LINE          31005
+#define KEY_CYCLE_RESID_DISPLAY_UP    31006
+#define KEY_CYCLE_RESID_DISPLAY_DN    31007
+#define KEY_OBSCODE_CLICKED           31008
 
 /* You can cycle between showing only the station data for the currently
 selected observation;  or the "normal" having,  at most,  a third of
@@ -168,8 +171,6 @@ int find_trial_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
              const double r1, const double angle_param);   /* orb_func.cpp */
 int search_for_trial_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
               const double r1, double *angle_param);  /* orb_func.cpp */
-int find_nth_sr_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
-                            const int orbit_number);       /* orb_func.cpp */
 void create_ades_file( const char *filename, const OBSERVE FAR *obs, int n_obs);
 char *fgets_trimmed( char *buff, size_t max_bytes, FILE *ifile);
 int generic_message_box( const char *message, const char *box_type);
@@ -186,20 +187,14 @@ int make_pseudo_mpec( const char *mpec_filename, const char *obj_name);
 int store_defaults( const ephem_option_t ephemeris_output_options,
          const int element_format, const int element_precision,
          const double max_residual_for_filtering,
-         const double noise_in_arcseconds);           /* elem_out.cpp */
+         const double noise_in_sigmas);           /* elem_out.cpp */
 int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
          int *element_precision, double *max_residual_for_filtering,
-         double *noise_in_arcseconds);                /* elem_out.cpp */
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
-int sort_obs_by_date_and_remove_duplicates( OBSERVE *obs, const int n_obs);
-int create_b32_ephemeris( const char *filename, const double epoch,
-                const double *orbit, const int n_steps,         /* b32_eph.c */
-                const double ephem_step, const double jd_start);
-void put_observer_data_in_text( const char FAR *mpc_code, char *buff);
+         double *noise_in_sigmas);                /* elem_out.cpp */
+double utc_from_td( const double jdt, double *delta_t);     /* ephem0.cpp */
 void fix_home_dir( char *filename);                /* ephem0.cpp */
 int write_environment_pointers( void);             /* mpc_obs.cpp */
-int add_ephemeris_details( FILE *ofile, const double start_jd,  /* b32_eph.c */
+int add_ephemeris_details( FILE *ofile, const double start_jd,  /* ephem0.c */
                                                const double end_jd);
 void set_distance( OBSERVE FAR *obs, double r);             /* orb_func.c */
 void set_statistical_ranging( const int new_using_sr);      /* elem_out.cpp */
@@ -220,10 +215,8 @@ bool is_topocentric_mpc_code( const char *mpc_code);
 int64_t nanoseconds_since_1970( void);                      /* mpc_obs.c */
 int metropolis_search( OBSERVE *obs, const int n_obs, double *orbit,
                const double epoch, int n_iterations, double scale);
-const char *get_find_orb_text( const int index);
 int set_tholen_style_sigmas( OBSERVE *obs, const char *buff);  /* mpc_obs.c */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
-int remove_rgb_code( char *buff);                              /* ephem.cpp */
 int find_vaisala_orbit( double *orbit, const OBSERVE *obs1,   /* orb_func.c */
                      const OBSERVE *obs2, const double solar_r);
 int extended_orbit_fit( double *orbit, OBSERVE *obs, int n_obs,
@@ -236,6 +229,8 @@ int orbital_monte_carlo( const double *orbit, OBSERVE *obs, const int n_obs,
 char *make_config_dir_name( char *oname, const char *iname);    /* miscell.cpp */
 int reset_astrometry_filename( int *argc, const char **argv);
 int set_language( const int language);                      /* elem_out.cpp */
+static void show_splash_screen( void);
+static void show_splash_screen_and_wait( void);
 void shellsort_r( void *base, const size_t n_elements, const size_t esize,
          int (*compare)(const void *, const void *, void *), void *context);
 static int count_wide_chars_in_utf8_string( const char *iptr, const char *endptr);
@@ -245,8 +240,26 @@ void make_observatory_info_text( char *text, const size_t textlen,
              const OBSERVE *obs, int n_obs, const char *mpc_code);
 void size_from_h_text( const double abs_mag, char *obuff,
                                  const int obuff_size);  /* ephem0.c */
+void create_sigma_hover_text( char *buff, const size_t buffsize,
+                     const OBSERVE FAR *obs);            /* ephem0.c */
 int find_fcct_biases( const double ra, const double dec, const char catalog,
                  const double jd, double *bias_ra, double *bias_dec);
+int select_tracklet( OBSERVE *obs, const int n_obs, const int idx);
+int get_orbit_from_mpcorb_sof( const char *object_name, double *orbit,
+             ELEMENTS *elems, const double full_arc_len, double *max_resid);
+int improve_sr_orbits( sr_orbit_t *orbits, OBSERVE FAR *obs,
+               const unsigned n_obs, const unsigned n_orbits,  /* orb_func.c */
+               const double noise_in_sigmas, const int writing_sr_elems);
+int save_ephemeris_settings( const ephem_option_t ephemeris_output_options,
+      const int n_steps, const char *obscode, const char *step_size,
+      const char *ephem_start, const char *config);      /* elem_out.cpp */
+int load_ephemeris_settings( ephem_option_t *ephemeris_output_options,
+      int *n_steps, char *obscode, char *step_size, char *ephem_start,
+      const char *config);                               /* elem_out.cpp */
+void compute_effective_solar_multiplier( const char *constraints);  /* runge.c */
+double find_kreutz_orbit( OBSERVE FAR *obs, int n_obs, double *orbit,
+                  const double q);  /* orb_func.c */
+void reset_sr_orbits( void);                             /* elem_out.cpp */
 
 #ifdef __cplusplus
 extern "C" {
@@ -274,15 +287,15 @@ extern double maximum_jd, minimum_jd;        /* orb_func.cpp */
 #define COLOR_RESIDUAL_LEGEND       9
 #define COLOR_MENU                 10
 #define COLOR_SCROLL_BAR           11
-#define COLOR_DEFAULT_INQUIRY      12
-#define COLOR_ATTENTION            13
+/* #define COLOR_DEFAULT_INQUIRY      12   Defined in 'mpc_obs.h' */
+/* #define COLOR_ATTENTION            13   Defined in 'mpc_obs.h' */
 #define COLOR_MPC_CODES            14
-#define COLOR_HINT_TEXT            18
+/* colors 15, 16, 17, and 18 also used for MPC codes;  see 'command.txt' */
 
 #define SHOW_FILE_IS_EPHEM          1
 #define SHOW_FILE_IS_CALENDAR       2
 
-static int curses_kbhit( )
+int curses_kbhit( )
 {
    int c;
 
@@ -318,6 +331,24 @@ static int extended_getch( void)
    return( rval);
 }
 
+int curses_kbhit_without_mouse( )
+{
+   int rval = curses_kbhit( );
+
+   if( rval != ERR)
+      {
+      extended_getch( );
+      if( rval == KEY_MOUSE)        /* ignoring the mouse */
+         {
+         MEVENT mouse_event;
+
+         getmouse( &mouse_event);
+         rval = ERR;
+         }
+      }
+   return( rval);
+}
+
 static int *store_curr_screen( void)
 {
    const int xsize = getmaxx( stdscr), ysize = getmaxy( stdscr);
@@ -334,40 +365,49 @@ static int *store_curr_screen( void)
    return( rval);
 }
 
-#ifndef __PDCURSES__
 /* Some ncurses platforms are squirrelly about how they handle
 mouse movements.  Console commands have to be issued to turn
-the mouse on or off.  This is still getting some testing,  and
-is commented out by default. */
+the mouse on or off.  */
+
+#ifndef __PDCURSES__
+   #define VT_IGNORE_ALL_MOUSE      CSI "?1003l\n"
+   #define VT_RECEIVE_ALL_MOUSE     CSI "?1003h\n"
+#endif
 
-#ifdef MOUSE_MOVEMENT_EVENTS_ENABLED
-   #define VT_IGNORE_ALL_MOUSE      "\033\133?1003l\n"
-   #define VT_RECEIVE_ALL_MOUSE     "\033\133?1003h\n"
+static void _disable_mouse_movements( void)
+{
+#ifdef VT_IGNORE_ALL_MOUSE
+   printf( VT_IGNORE_ALL_MOUSE);
 #endif
+   mousemask( default_mouse_events, NULL);
+}
+
+static void _enable_mouse_movements( void)
+{
+#ifdef VT_RECEIVE_ALL_MOUSE
+   printf( VT_RECEIVE_ALL_MOUSE);
 #endif
+   mousemask( default_mouse_events | REPORT_MOUSE_POSITION, NULL);
+}
 
 #ifdef __WATCOMC__
 #undef endwin
 extern "C" {
-PDCEX  int     endwin_x64_4302(void);
+PDCEX  int     endwin_u64_4400(void);
 }
-#define endwin endwin_x64_4302
+#define endwin endwin_u64_4400
 #endif
 
 static int full_endwin( void)
 {
-#ifdef VT_IGNORE_ALL_MOUSE
-   printf( VT_IGNORE_ALL_MOUSE);
-#endif
+   _disable_mouse_movements( );
    return( endwin( ));
 }
 
 #ifndef _WIN32
 static int restart_curses( void)
 {
-#ifdef VT_RECEIVE_ALL_MOUSE
-   printf( VT_RECEIVE_ALL_MOUSE);
-#endif
+   _enable_mouse_movements( );
    return( refresh( ));
 }
 #endif
@@ -384,13 +424,14 @@ static void restore_screen( const int *screen)
       mvaddchnstr( y, 0, cptr, n_out);
 }
 
-int clipboard_to_file( const char *filename, const int append); /* clipfunc.cpp */
+int clipboard_to_file( const char *filename, const int append,
+                           const bool use_selection); /* clipfunc.cpp */
 int copy_file_to_clipboard( const char *filename);    /* clipfunc.cpp */
 
 static bool curses_running = false;
 
 static const char *help_file_name = NULL;
-static bool mpc_code_select = false;
+static int mpc_code_select = 0;
 
 #define HINT_TEXT -1
 
@@ -408,7 +449,7 @@ static int full_inquire( const char *prompt, char *buff, const int max_len,
 
    while( rval < 0)
       {
-      int i, j, n_lines = 1, line_start = 0, box_size = (buff ? 14 : 0);
+      int i, j, n_lines = 1, box_size = (buff ? 14 : 0);
       const int side_borders = 1;   /* leave a blank on either side */
       int real_width, line = line0, col = col0;
       char tbuff[200];
@@ -416,20 +457,27 @@ static int full_inquire( const char *prompt, char *buff, const int max_len,
       int x, y, z;
       mmask_t button;
 
-      for( i = 0; prompt[i]; i++)
-         if( prompt[i] == '\n' || !prompt[i + 1])
+      i = 0;
+      while( prompt[i])
+         {
+         int new_size;
+
+         j = i;
+         while( prompt[j] && prompt[j] != '\n')
+            j++;
+         new_size = count_wide_chars_in_utf8_string(
+                        prompt + i, prompt + j);
+         if( help_file_name && !i)
+            new_size += 4;       /* ensure room on top line for [?] */
+         if( box_size < new_size)
+            box_size = new_size;
+         i = j;
+         if( prompt[i])   /* skip trailing '\n's */
             {
-            int new_size = count_wide_chars_in_utf8_string(
-                        prompt + line_start, prompt + i);
-
-            if( help_file_name && !line_start)
-               new_size += 4;       /* ensure room on top line for [?] */
-            if( box_size < new_size)
-               box_size = new_size;
-            line_start = i;
-            if( prompt[i + 1])   /* ignore trailing '\n's */
-               n_lines++;
+            n_lines++;
+            i++;
             }
+         }
       if( box_size > getmaxx( stdscr) - 2)
          box_size = getmaxx( stdscr) - 2;
 
@@ -567,12 +615,26 @@ static int full_inquire( const char *prompt, char *buff, const int max_len,
                curr_line = y;
                x -= col;
                y -= line - n_lines;
-               if( mpc_code_select && x > real_width - 3)
-                  x = -1;        /* ignore some of the right margin */
-               if( y >= 0 && y < n_lines && x >= 0 && x < real_width)
+               if( button & BUTTON4_PRESSED)   /* actually 'wheel up' */
+                  rval = KEY_UP;
+               else if( button5_pressed)       /* actually 'wheel down' */
+                  rval = KEY_DOWN;
+               else if( y >= 0 && y < n_lines && x >= 0 && x < real_width)
                   {
                   if( mpc_code_select)
-                     rval = KEY_F( 1 + x / 4 + y * (box_size / 4));
+                     {
+                     int selection;
+
+                     if( x == real_width - 1)
+                        x--;
+                     selection = x / 4 + y * (box_size / 4 + 1);
+                     if( y == n_lines - 1)
+                        rval = 27;
+                     else if( selection < mpc_code_select)
+                        rval = KEY_F( 1 + selection);
+                     else
+                        curr_line = -1;
+                     }
                   else
                      rval = KEY_F( y + 1);
                   }
@@ -588,7 +650,7 @@ static int full_inquire( const char *prompt, char *buff, const int max_len,
                         {
                         const attr_t attr = (pass ? A_REVERSE : A_NORMAL);
 
-                        if( mpc_code_select)
+                        if( mpc_code_select && highlit_line < line - 1)
                            mvchgat( highlit_line, col + highlit_x - highlit_x % 4,
                                                5, attr, color, NULL);
                         else
@@ -629,16 +691,28 @@ static int full_inquire( const char *prompt, char *buff, const int max_len,
 int inquire( const char *prompt, char *buff, const int max_len,
                      const int color)
 {
+   extern char *mpec_error_message;
+
+   assert( prompt);
+   if( !mpec_error_message && color == COLOR_ATTENTION)
+      {
+      const size_t len = strlen( prompt) + 1;
+
+      mpec_error_message = (char *)malloc( len);
+      strlcpy_err( mpec_error_message, prompt, len);
+      }
    return( full_inquire( prompt, buff, max_len, color, -1, -1));
 }
 
 static int select_mpc_code( const OBSERVE *obs, const int n_obs, int curr_obs)
 {
-   char *buff = (char *)malloc( 1000);
+   const int max_n_codes = 500;
+   const int buffsize = max_n_codes * 4 + 70;
+   char *buff = (char *)malloc( buffsize);
    int n_codes = 0, i, nx = 0, c;
 
    *buff = '\0';
-   for( i = 0; i < n_obs; i++)
+   for( i = 0; i < n_obs && n_codes < max_n_codes; i++)
       if( !strstr( buff, obs[i].mpc_code))
          {
          int j = 0;
@@ -653,14 +727,16 @@ static int select_mpc_code( const OBSERVE *obs, const int n_obs, int curr_obs)
          memcpy( tptr, obs[i].mpc_code, 3);
          tptr[3] = ' ';
          n_codes++;
-         if( nx * nx < n_codes)
+         if( nx * nx < n_codes && (nx + 1) * 4 < COLS - 3)
             nx++;
          }
-   for( i = nx; i <= n_codes; i += nx)
+   for( i = nx; i < n_codes; i += nx)
       buff[i * 4 - 1] = '\n';
-   mpc_code_select = true;
+   buff[n_codes * 4 - 1] = '\0';
+   strlcat_err( buff, "\nCancel", buffsize);
+   mpc_code_select = n_codes;
    c = inquire( buff, NULL, 0, COLOR_DEFAULT_INQUIRY);
-   mpc_code_select = false;
+   mpc_code_select = 0;
    c -= KEY_F( 1);
    if( c >= 0 && c < n_codes)
       {
@@ -721,7 +797,7 @@ static double *set_up_alt_orbits( const double *orbit, unsigned *n_orbits)
    switch( available_sigmas)
       {
       case COVARIANCE_AVAILABLE:
-         memcpy( sr_orbits, orbit, MAX_N_PARAMS * sizeof( double));
+         memcpy( sr_orbits, orbit, n_orbit_params * sizeof( double));
          compute_variant_orbit( sr_orbits + n_orbit_params, sr_orbits, 1.);
          *n_orbits = 2;
          break;
@@ -729,7 +805,7 @@ static double *set_up_alt_orbits( const double *orbit, unsigned *n_orbits)
          *n_orbits = n_sr_orbits;
          break;
       default:
-         memcpy( sr_orbits, orbit, MAX_N_PARAMS * sizeof( double));
+         memcpy( sr_orbits, orbit, n_orbit_params * sizeof( double));
          *n_orbits = 1;
          break;
       }
@@ -785,7 +861,7 @@ static void set_ra_dec_format( void)
    buff[len] = '\0';
    help_file_name = "radecfmt.txt";
    c = inquire( buff, NULL, 0, COLOR_DEFAULT_INQUIRY);
-   if( c >= '1' && c < '1' + (int)n_lines)
+   if( c >= '0' && c < '1' + (int)n_lines)
       c += KEY_F( 1) - '1';
    if( c >= KEY_F( 1) && c <= (int)KEY_F( n_lines))
       {
@@ -800,6 +876,51 @@ static void set_ra_dec_format( void)
       }
 }
 
+static void select_angular_motion_units( void)
+{
+   char buff[1000], *tptr = buff, curr_units[4];
+   int c;
+
+   strlcpy( curr_units, get_environment_ptr( "MOTION_UNITS"),
+                     sizeof( curr_units));
+   if( !*curr_units)
+      strlcpy( curr_units, "'/h", sizeof( curr_units));
+   strlcpy_error( buff, get_find_orb_text( 2078));
+   if( (tptr = strstr( buff, curr_units)) != NULL)
+      {                    /* mark currently selected units */
+      while( *tptr != '(')
+         tptr--;
+      tptr[1] = 'o';
+      }
+   c = inquire( buff, NULL, 0, COLOR_DEFAULT_INQUIRY);
+   if( c >= '0' && c < '9')
+      c -= '0';
+   else
+      c -= KEY_F( 1);
+   if( c >= 0)
+      {
+      tptr = buff;
+      while( *tptr && c)
+         {
+         while( *tptr && *tptr != '\n')
+            tptr++;
+         if( *tptr == '\n')
+            tptr++;
+         c--;
+         }
+      if( *tptr)
+         {
+         size_t i = 0;
+
+         tptr += 6;
+         while( tptr[i] > ' ')
+            i++;
+         tptr[i] = '\0';
+         set_environment_ptr( "MOTION_UNITS", tptr);
+         }
+      }
+}
+
 /* For 'radio button' dialogs such as the comet model,  resid type,  and
 ephemeris type (see 'efindorb.txt'),  this sets the appropriate pseudo-radio
 button. */
@@ -816,6 +937,15 @@ static char *_set_radio_button( char *text, const int option_num)
    return( line_ptr);
 }
 
+static void show_calendar( void)
+{
+   FILE *ifile = fopen_ext( "calend.txt", "crb");
+
+   if( ifile)
+      fclose( ifile);
+   show_a_file( (ifile ? "calend.txt" : "calendar.txt"), SHOW_FILE_IS_CALENDAR);
+}
+
 /* Here's a simplified example of the use of the 'ephemeris_in_a_file'
    function... nothing fancy,  but it shows how it's used.  */
 
@@ -832,21 +962,28 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
    char buff[2000];
    double jd_start = 0., jd_end = 0., step = 0.;
    bool show_advanced_options = false;
+   int offset_line = 0;
+   char message_to_user[180];
 
+   *message_to_user = '\0';
    while( c > 0)
       {
       int format_start;
       unsigned i, n_lines;
-      int vect_frame = -1;
+      int vect_frame = -1, planet_idx;
       double vect_dist_units = 0., vect_time_units = 0.;
       const int ephem_type = (int)(ephemeris_output_options & 7);
       bool reset_vect_units = false;
       extern double ephemeris_mag_limit;
       const char *tptr, *err_msg = NULL;
+      char *end_of_location_text;
       char vect_epoch[9];
       const bool is_topocentric =
                is_topocentric_mpc_code( mpc_code);
 
+      put_colored_text( message_to_user, getmaxy( stdscr) - 1, 0, -1,
+                        COLOR_MESSAGE_TO_USER);
+      *message_to_user = '\0';
       jd_start = 0.;
       format_start = extract_date( ephemeris_start, &jd_start);
       step = get_step_size( ephemeris_step_size, NULL, NULL);
@@ -875,8 +1012,9 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                                         n_ephemeris_steps);
       snprintf_append( buff, sizeof( buff) , "S  Step size: %.60s\n", ephemeris_step_size);
       snprintf_append( buff, sizeof( buff), "L  Location: (%s) ", mpc_code);
-      put_observer_data_in_text( mpc_code, buff + strlen( buff));
+      planet_idx = put_observer_data_in_text( mpc_code, buff + strlen( buff));
       strcat( buff, "\n");
+      end_of_location_text = buff + strlen( buff);
       if( ephem_type == OPTION_STATE_VECTOR_OUTPUT
                    || ephem_type == OPTION_POSITION_OUTPUT)
          {
@@ -946,13 +1084,11 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                   (ephemeris_output_options & OPTION_RADIAL_VEL_OUTPUT) ? '*' : ' ');
          snprintf_append( buff, sizeof( buff), "P [%c] Phase angle\n",
                   (ephemeris_output_options & OPTION_PHASE_ANGLE_OUTPUT) ? '*' : ' ');
+         snprintf_append( buff, sizeof( buff), "V [%c] Visibility indicator\n",
+               (ephemeris_output_options & OPTION_VISIBILITY) ? '*' : ' ');
          if( is_topocentric)
-            {
-            snprintf_append( buff, sizeof( buff), "V [%c] Visibility indicator\n",
-                  (ephemeris_output_options & OPTION_VISIBILITY) ? '*' : ' ');
             snprintf_append( buff, sizeof( buff), "U [%c] Suppress unobservables\n",
                   (ephemeris_output_options & OPTION_SUPPRESS_UNOBSERVABLE) ? '*' : ' ');
-            }
          snprintf_append( buff, sizeof( buff), "F Suppress when fainter than mag: %.1f\n",
                   ephemeris_mag_limit);
          snprintf_append( buff, sizeof( buff), "D [%c] Positional sigmas\n",
@@ -1009,15 +1145,44 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                   (ephemeris_output_options & OPTION_EXPOSURE_TIME) ? '*' : ' ');
             snprintf_append( buff, sizeof( buff), "= [%c] Constellation\n",
                   (ephemeris_output_options & OPTION_CONSTELLATION) ? '*' : ' ');
+            snprintf_append( buff, sizeof( buff), "$ [%c] RVel, delta sigmas\n",
+                  (ephemeris_output_options & OPTION_RV_AND_DELTA_SIGMAS) ? '*' : ' ');
             }
          }
       for( i = n_lines = 0; buff[i]; i++)
          if( buff[i] == '\n')
-            {
             n_lines++;
-            if( n_lines + 4 == (unsigned)LINES)
-               buff[i + 1] = '\0';
+      if( n_lines > (unsigned)LINES - 3)
+         {
+         char *tptr1, *tptr = end_of_location_text;
+
+         if( offset_line < 0)
+            offset_line = 0;
+         if( offset_line > (int)n_lines - (LINES - 4))
+            offset_line = (int)n_lines - ( LINES - 4);
+
+         for( i = 0; i < (unsigned)offset_line; i++)
+            {
+            tptr = strchr( tptr, '\n');
+            assert( tptr);
+            tptr++;
+            }
+         tptr1 = tptr;
+         for( i = 0; i < (unsigned)( LINES - 10); i++)
+            {
+            tptr1 = strchr( tptr1, '\n');
+            if( !tptr1)
+               fprintf( stderr, "\ni %u offset_line %u n_lines %u LINES %d\n",
+                           i, offset_line, n_lines, LINES);
+            assert( tptr1);
+            tptr1++;
+            if( !*tptr1)
+               break;
             }
+         *tptr1 = '\0';
+         memmove( end_of_location_text, tptr, tptr1 - tptr + 1);
+         strlcat_error( buff, "Up/down arrows or mouse wheel for other options\n");
+         }
       tptr = get_find_orb_text( 2064);
       i = ephem_type;
       while( i && *tptr)
@@ -1035,7 +1200,7 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
          tptr = (char *)"Unknown";
          i = 7;
          }
-      snprintf_append( buff, sizeof( buff), "C  %.*s\n", i, tptr);
+      snprintf_append( buff, sizeof( buff), "C  Ephemeris type : %.*s\n", i, tptr);
       snprintf_append( buff, sizeof( buff), "M  Make ephemeris\n");
       snprintf_append( buff, sizeof( buff), "Q  Return to main display");
       n_lines += 4;
@@ -1052,13 +1217,42 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
          for( i = 0; buff[i] && n; i++)
             if( buff[i] == '\n')
                n--;
-         c = buff[i];
+         c = tolower( buff[i]);
          }
       if( c >= ALT_0 && c <= ALT_7)
          {
          ephemeris_output_options &= ~7;
          ephemeris_output_options |= (c - ALT_0);
          }
+      else if( c == ALT_A)
+         {                    /* loading configuration */
+         c = inquire( "Hit letter of configuration to load",
+                         NULL, 30, COLOR_MESSAGE_TO_USER);
+         if( c >= 'a' && c <= 'z')
+            {
+            char tstr[2];
+            int err_code;
+
+            tstr[0] = (char)( c + 'A' - 'a');
+            tstr[1] = '\0';
+            snprintf( buff, sizeof( buff), "STORED_EPHEM_%c", c);
+            err_code = load_ephemeris_settings( &ephemeris_output_options, &n_ephemeris_steps,
+                           mpc_code, ephemeris_step_size, ephemeris_start, tstr);
+            snprintf( message_to_user, sizeof( message_to_user),
+                  (err_code ? "Preset %c not found" : "Preset %c loaded"), c);
+            }
+         }
+      else if( c >= CTRL( 'A') && c <= CTRL( 'Z'))
+         {                    /* saving configuration */
+         char tstr[2];
+
+         tstr[0] = (char)( c + 'A' - CTRL( 'A'));
+         tstr[1] = '\0';
+         save_ephemeris_settings( ephemeris_output_options, n_ephemeris_steps,
+                        mpc_code, ephemeris_step_size, ephemeris_start, tstr);
+         snprintf( message_to_user, sizeof( message_to_user),
+                  "Preset %c set to current ephemeris options", c);
+         }
       else switch( c)
          {
          case '0':
@@ -1108,7 +1302,7 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
          case 'b': case 'B':
             ephemeris_output_options ^= OPTION_PHASE_ANGLE_BISECTOR;
             break;
-         case 'c': case 'C':
+         case 'c':
             {
             strlcpy_error( buff, get_find_orb_text( 2064));
             _set_radio_button( buff, ephem_type);
@@ -1125,6 +1319,9 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                }
             }
             break;
+         case 'C':
+            show_calendar( );
+            break;
          case 'd': case 'D':
             if( vect_frame  > -1)
                {
@@ -1197,12 +1394,20 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                {
                if( strlen( buff) < 3)
                   err_msg = "MPC codes must be at least three characters long";
-               else if( strlen( buff) < 50 || !memcmp( buff, "Ast", 3))
+               else if( strlen( buff) < 5 || !memcmp( buff, "Ast", 3)
+                           || !get_lat_lon_info( NULL, buff))
                   strlcpy_error( mpc_code, buff);
-               else if( !get_observer_data( buff, buff, NULL))
+               else if( strlen( buff) > 4)
                   {
-                  buff[3] = '\0';
-                  strlcpy_error( mpc_code, buff);
+                  if( !get_observer_data( buff, buff, NULL))
+                     {
+                     buff[4] = '\0';
+                     if( buff[3] == ' ')
+                        buff[3] = '\0';
+                     strlcpy_error( mpc_code, buff);
+                     }
+                  else
+                     err_msg = "Didn't understand that observatory code";
                   }
                }
             break;
@@ -1234,6 +1439,8 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
                err_msg = "You need to set the number of ephemeris steps!";
             else if( !step && *ephemeris_step_size != 'a')
                err_msg = "You need to set a valid step size!";
+            else if( planet_idx == -1)
+               err_msg = "You need to set a valid observer location!";
             else                 /* yes,  we can make an ephemeris */
                c = -2;
             }
@@ -1245,6 +1452,8 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
             break;
          case 'o': case 'O':
             ephemeris_output_options ^= OPTION_SEPARATE_MOTIONS;
+            if( ephemeris_output_options & OPTION_SEPARATE_MOTIONS)
+               select_angular_motion_units( );
             break;
          case 'p': case 'P':
             if( vect_frame > -1)
@@ -1344,6 +1553,8 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
             break;
          case 'z': case 'Z':
             ephemeris_output_options ^= OPTION_MOTION_OUTPUT;
+            if( ephemeris_output_options & OPTION_MOTION_OUTPUT)
+               select_angular_motion_units( );
             break;
          case '#':
             ephemeris_output_options ^= OPTION_MOIDS;
@@ -1351,6 +1562,9 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
          case '=':
             ephemeris_output_options ^= OPTION_CONSTELLATION;
             break;
+         case '$':
+            ephemeris_output_options ^= OPTION_RV_AND_DELTA_SIGMAS;
+            break;
          case 'q': case 'Q':
          case 27:
             c = -1;
@@ -1360,6 +1574,12 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
             exit( 0);
             break;
 #endif
+         case KEY_UP:
+            offset_line--;
+            break;
+         case KEY_DOWN:
+            offset_line++;
+            break;
          default:
          case '\'': case '"': case '<':
          case ',': case '.': case '>':
@@ -1380,47 +1600,35 @@ static void create_ephemeris( const double *orbit, const double epoch_jd,
 
    if( c == -2)         /* yes,  we're making an ephemeris */
       {
-      if( !strcmp( mpc_code, "32b"))
-         {
-         inquire( ".b32 filename:",
-                               buff, sizeof( buff), COLOR_DEFAULT_INQUIRY);
-         if( *buff)
-            {
-            strcat( buff, ".b32");
-            create_b32_ephemeris( buff, epoch_jd, orbit, n_ephemeris_steps,
-                     atof( ephemeris_step_size), jd_start);    /* b32_eph.c */
-            }
-         }
+      const double *orbits_to_use = orbit;
+      extern const char *ephemeris_filename;
+      unsigned n_orbits = 1;
+      const bool is_observables =
+               ((ephemeris_output_options & 7) == OPTION_OBSERVABLES);
+
+      if( is_observables && (ephemeris_output_options & OPTION_SHOW_SIGMAS))
+         orbits_to_use = set_up_alt_orbits( orbit, &n_orbits);
+      if( ephemeris_in_a_file_from_mpc_code(
+            get_file_name( buff, ephemeris_filename),
+            orbits_to_use, obs, n_obs,
+            epoch_jd, jd_start, ephemeris_step_size,
+            n_ephemeris_steps, mpc_code,
+            ephemeris_output_options, n_orbits))
+         inquire( "Ephemeris generation failed!  Hit any key:", NULL, 0,
+                           COLOR_MESSAGE_TO_USER);
       else
          {
-         const double *orbits_to_use = orbit;
-         extern const char *ephemeris_filename;
-         unsigned n_orbits = 1;
-
-         if( (ephemeris_output_options & 7) == OPTION_OBSERVABLES &&
-                     (ephemeris_output_options & OPTION_SHOW_SIGMAS))
-            orbits_to_use = set_up_alt_orbits( orbit, &n_orbits);
-         if( ephemeris_in_a_file_from_mpc_code(
-               get_file_name( buff, ephemeris_filename),
-               orbits_to_use, obs, n_obs,
-               epoch_jd, jd_start, ephemeris_step_size,
-               n_ephemeris_steps, mpc_code,
-               ephemeris_output_options, n_orbits))
-            inquire( "Ephemeris generation failed!  Hit any key:", NULL, 0,
-                              COLOR_MESSAGE_TO_USER);
-         else
+         show_a_file( get_file_name( buff, ephemeris_filename),
+                        (is_observables? SHOW_FILE_IS_EPHEM : 0));
+         create_resid_file( obs, n_obs, input_filename, residual_format);
+         make_pseudo_mpec( get_file_name( buff, "mpec.htm"), obj_name);
+         if( ephemeris_output_options
+                  & (OPTION_STATE_VECTOR_OUTPUT | OPTION_POSITION_OUTPUT))
             {
-            show_a_file( get_file_name( buff, ephemeris_filename), SHOW_FILE_IS_EPHEM);
-            create_resid_file( obs, n_obs, input_filename, residual_format);
-            make_pseudo_mpec( get_file_name( buff, "mpec.htm"), obj_name);
-            if( ephemeris_output_options
-                     & (OPTION_STATE_VECTOR_OUTPUT | OPTION_POSITION_OUTPUT))
-               {
-               FILE *ofile = fopen_ext( ephemeris_filename, "tfca");
+            FILE *ofile = fopen_ext( ephemeris_filename, "tfca");
 
-               add_ephemeris_details( ofile, jd_start, jd_end);
-               fclose( ofile);
-               }
+            add_ephemeris_details( ofile, jd_start, jd_end);
+            fclose( ofile);
             }
          }
       }
@@ -1592,11 +1800,12 @@ int select_object_in_file( OBJECT_INFO *ids, const int n_ids)
             }
          put_colored_text( "[?]", 0, xmax - 4, 3,
                               A_REVERSE | COLOR_BACKGROUND);
+         put_colored_text( "Open...", n_lines + 1, x0 + 12, 7, COLOR_HIGHLIT_BUTTON);
+         put_colored_text( "About", n_lines + 1, x0 + 6, 5, COLOR_HIGHLIT_BUTTON);
+         put_colored_text( "HELP", n_lines + 1, x0 + 20, 4, COLOR_HIGHLIT_BUTTON);
          if( *search_text)
             put_colored_text( search_text, n_lines + 1, x0,
                       (int)strlen( search_text), COLOR_FINAL_LINE);
-         put_colored_text( "Open...", n_lines + 1, x0 + 12, 7, COLOR_HIGHLIT_BUTTON);
-         put_colored_text( "HELP", n_lines + 1, x0 + 20, 4, COLOR_HIGHLIT_BUTTON);
          flushinp( );
          do
             {
@@ -1604,10 +1813,11 @@ int select_object_in_file( OBJECT_INFO *ids, const int n_ids)
             err_message = 0;
             if( c == KEY_MOUSE)
                {
-               int x, y, z;
+               int x, y, z, dx;
                mmask_t button;
 
                get_mouse_data( &x, &y, &z, &button);
+               dx = x - x0;
                if( button & REPORT_MOUSE_POSITION)
                   c = 0;
                else if( button & BUTTON4_PRESSED)   /* actually 'wheel up' */
@@ -1618,14 +1828,17 @@ int select_object_in_file( OBJECT_INFO *ids, const int n_ids)
                   c = '?';                 /* clicked on [?] at upper right */
                else if( y < n_lines)
                   choice = curr_page + y + (x / column_width) * n_lines;
-               else if( y == n_lines + 1 && x >= x0 - 12 && x < x0 + 19)
-                  c = ALT_F;           /* clicked on 'Open...' */
-               else if( y == n_lines + 1 || y == n_lines)
-                  c = '?';
-               else if( y == n_lines + 2 && x >= x0)
+               else if( y == n_lines + 1 && dx >= 6)
+                  {
+                  if( dx >= 19)
+                     c = '?';           /* clicked on 'HELP' */
+                  else if( dx >= 11)
+                     c = ALT_F;           /* clicked on 'Open...' */
+                  else
+                     c = '.';           /* clicked on 'About' */
+                  }
+               else if( y == n_lines + 2 && dx > 0)
                   {
-                  const int dx = x - x0;
-
                   if( dx >= 20)
                      c = 27;          /* quit */
                   else if( dx >= 15)
@@ -1645,7 +1858,7 @@ int select_object_in_file( OBJECT_INFO *ids, const int n_ids)
             c = 8;
                      /* if a letter/number is hit,  look for an obj that */
                      /* starts with that letter/number: */
-         if( (c >= ' ' && c <= 'z' && c != '?') || c == 8)
+         if( (c >= ' ' && c <= 'z' && c != '?' && c != '.') || c == 8)
             {
             size_t len = strlen( search_text);
 
@@ -1685,6 +1898,9 @@ int select_object_in_file( OBJECT_INFO *ids, const int n_ids)
 #endif
          switch( c)
             {
+            case '.':
+               show_splash_screen_and_wait( );
+               break;
             case '?':
                show_a_file( "obj_help.txt", 0);
                break;
@@ -1817,9 +2033,23 @@ static int get_character_code( const char *buff)
 {
    int rval;
 
-   if( !memcmp( buff, "Alt-", 4))
+   if( *buff <= ' ')
+      rval = 0;
+   else if( !memcmp( buff, "Lt", 2))
+      rval = KEY_LEFT;
+   else if( !memcmp( buff, "Rt", 2))
+      rval = KEY_RIGHT;
+   else if( !memcmp( buff, "Up", 2))
+      rval = KEY_UP;
+   else if( !memcmp( buff, "Dn", 2))
+      rval = KEY_DOWN;
+   else if( !memcmp( buff, "Alt-", 4))
       {
-      if( buff[4] >= 'A' && buff[4] <= 'Z')
+      if( !memcmp( buff + 4, "Up", 2))
+         rval = ALT_UP;
+      else if( !memcmp( buff + 4, "Dn", 2))
+         rval = ALT_DOWN;
+      else if( buff[4] >= 'A' && buff[4] <= 'Z')
          rval = ALT_A + buff[4] - 'A';
       else
          rval = ALT_0 + buff[4] - '0';
@@ -1829,7 +2059,37 @@ static int get_character_code( const char *buff)
    else if( *buff == 'U' && buff[1] == '+')
       rval = atoi( buff + 2);
    else if( !memcmp( buff, "Ctrl-", 5))
-      rval = buff[5] - 64;
+      {
+      if( !memcmp( buff + 5, "Up", 2))
+         rval = CTL_UP;
+      else if( !memcmp( buff + 5, "Dn", 2))
+         rval = CTL_DN;
+      else if( !memcmp( buff + 5, "Lf", 2))
+         rval = CTL_LEFT;
+      else if( !memcmp( buff + 5, "Rt", 2))
+         rval = CTL_RIGHT;
+      else
+         rval = buff[5] - 64;
+      }
+   else if( !memcmp( buff, "Shift-", 6))
+      {
+      if( !memcmp( buff + 6, "Up", 2))
+         rval = KEY_SR;
+      else if( !memcmp( buff + 6, "Dn", 2))
+         rval = KEY_SF;
+      else if( !memcmp( buff + 6, "Lf", 2))
+         rval = KEY_SLEFT;
+      else if( !memcmp( buff + 6, "Rt", 2))
+         rval = KEY_SRIGHT;
+      else if( buff[6] == 'F')
+         rval = KEY_F( 12 + atoi( buff + 7));
+      else        /* shouldn't happen */
+         {
+         rval = 0;
+         fprintf( stderr, "Buff '%s'\n", buff);
+         assert( 0);
+         }
+      }
    else
       rval = *buff;
    return( rval);
@@ -1861,35 +2121,36 @@ static unsigned show_basic_info( const OBSERVE FAR *obs, const int n_obs,
       {
       while( fgets_trimmed( buff, sizeof( buff), ifile)
                      && memcmp( buff, "End", 3))
-         {
-         const unsigned len = (unsigned)strlen( buff + 15);
-         unsigned max_column_this_line = max_column, key;
-
-         if( line == 1)
-            max_column_this_line -= (max_lines_to_show > 1 ? 12 : 8);
-         if( column + len >= max_column_this_line)
+         if( *buff != ' ')
             {
-            if( line == max_lines_to_show)
-               {
-               fclose( ifile);
-               add_cmd_area( KEY_ADD_MENU_LINE, 0, max_column - 8, 3);
-               put_colored_text( "[+]", 0, max_column - 8, 3, COLOR_MENU);
-               return( line);
-               }
-            if( line == 1)        /* we could subtract lines */
+            const unsigned len = (unsigned)strlen( buff + 15);
+            unsigned max_column_this_line = max_column, key;
+
+            if( line == 1)
+               max_column_this_line -= (max_lines_to_show > 1 ? 12 : 8);
+            if( column + len >= max_column_this_line)
                {
-               add_cmd_area( KEY_REMOVE_MENU_LINE, 0, max_column - 12, 3);
-               put_colored_text( "[-]", 0, max_column - 12, 3, COLOR_MENU);
+               if( line == max_lines_to_show)
+                  {
+                  fclose( ifile);
+                  add_cmd_area( KEY_ADD_MENU_LINE, 0, max_column - 8, 3);
+                  put_colored_text( "[+]", 0, max_column - 8, 3, COLOR_MENU);
+                  return( line);
+                  }
+               if( line == 1)        /* we could subtract lines */
+                  {
+                  add_cmd_area( KEY_REMOVE_MENU_LINE, 0, max_column - 12, 3);
+                  put_colored_text( "[-]", 0, max_column - 12, 3, COLOR_MENU);
+                  }
+               column = 0;
+               line++;
+               put_colored_text( "", line - 1, column, -1, COLOR_BACKGROUND);
                }
-            column = 0;
-            line++;
-            put_colored_text( "", line - 1, column, -1, COLOR_BACKGROUND);
+            key = get_character_code( buff);
+            add_cmd_area( key, line - 1, column, len);
+            put_colored_text( buff + 15, line - 1, column, len, COLOR_MENU);
+            column += len + 1;
             }
-         key = get_character_code( buff);
-         add_cmd_area( key, line - 1, column, len);
-         put_colored_text( buff + 15, line - 1, column, len, COLOR_MENU);
-         column += len + 1;
-         }
       fclose( ifile);
       }
    if( line != 1)
@@ -2070,15 +2331,23 @@ static void show_right_hand_scroll_bar( const int line_start,
          {
          int color = COLOR_SCROLL_BAR;
          const char *text = "|";
+         const char *end_text = "-";
 
-         if( !i || i == lines_to_show - 1)
+         if( !i)
+            {
+            color = COLOR_OBS_INFO;
+            text = (first_line ? "^" : end_text);
+            }
+         else if( i == lines_to_show - 1)
             {
             color = COLOR_OBS_INFO;
-            text = (i ? "v" : "^");
+            text = (first_line + lines_to_show == n_lines ? end_text : "v");
             }
          else
             if( i >= scroll0 && i <= scroll1)
                color = COLOR_HIGHLIT_BUTTON;
+         if( text == end_text)
+            color = COLOR_MENU;
          put_colored_text( text, i + line_start, getmaxx( stdscr) - 1, -1,
                               color);
          }
@@ -2140,6 +2409,7 @@ static void show_one_observation( OBSERVE obs, const int line,
    int color = COLOR_BACKGROUND;       /* show in 80-column MPC */
    char resid_data[70];      /* format, w/added data if it fits */
    const int dropped_start = 12;     /* ...but omit designation */
+   size_t i, len;
 
    put_colored_text( "", line, 0, -1, COLOR_BACKGROUND);
    add_to_mpc_color( obs.mpc_code, 1000);
@@ -2173,7 +2443,11 @@ static void show_one_observation( OBSERVE obs, const int line,
       }
                      /* show corresponding 1s or 0.1s HHMMSS fmt */
    recreate_observation_line( buff, &obs, residual_format);
-   memmove( buff, buff + dropped_start, strlen( buff + dropped_start) + 1);
+   assert( 80 == strlen( buff));
+   len = strlen( buff + dropped_start) + 1;
+   for( i = 0; i < len; i++)
+      buff[i] = buff[i + dropped_start];
+/* memmove( buff, buff + dropped_start, strlen( buff + dropped_start) + 1);   */
    strcat( buff, resid_data);
    if( obs.flags & OBS_IS_SELECTED)
       color = COLOR_SELECTED_OBS;
@@ -2194,14 +2468,17 @@ static void show_one_observation( OBSERVE obs, const int line,
 }
 
 static void show_observations( const OBSERVE *obs, const int first_obs_idx,
-                int line_no, const int residual_format, const int n_obs_shown)
+                int line_no, const int residual_format, const int n_obs_shown,
+                const int n_obs)
 {
    int i;
-   const int underline_freq = atoi( get_environment_ptr( "UNDERLINE_OBS"));
 
    for( i = first_obs_idx; i < first_obs_idx + n_obs_shown; i++)
+      {
+      add_cmd_area( KEY_OBSCODE_CLICKED, line_no, 65, 3);
       show_one_observation( obs[i], line_no++, residual_format,
-            underline_freq && i % underline_freq == underline_freq - 1);
+            i == n_obs - 1);
+      }
 }
 
 static void show_final_line( const int n_obs,
@@ -2256,6 +2533,15 @@ static void show_residual_legend( const int line_no, const int residual_format)
                   ? "      Xres  Yres  total Mres"
                   : "      Tres  Cres  total Mres");
 
+   if( residual_format & RESIDUAL_FORMAT_SHOW_DESIGS)
+      text_search_and_replace( buff, "sigmas", "desigs");
+   else
+      {
+      extern int sigmas_in_columns_57_to_65;
+
+      if( !sigmas_in_columns_57_to_65)
+         text_search_and_replace( buff, "sigmas", "------");
+      }
    put_colored_text( buff, line_no, 0, -1, COLOR_RESIDUAL_LEGEND);
    add_cmd_area( 't', line_no, 73, 10);  /* click on 'Xres  Yres' resets resid format */
    add_cmd_area( '=', line_no, 85, 7);   /* click on ' delta ' toggles mag resids */
@@ -2268,10 +2554,46 @@ static void show_residual_legend( const int line_no, const int residual_format)
 static int find_rgb( const int irgb);
 static void set_color_table( void);
 
+static void drop_starting_columns( char *buff, const int start_column)
+{
+   char *tptr = (char *)find_nth_utf8_char( buff, (size_t)start_column);
+
+   memmove( buff, tptr, strlen( tptr) + 1);
+}
+
+/* Ephemeris files may contain a six-character hexadecimal color,
+computed using sky background brightness data,  prefaced by
+'$'.  This should be removed before the line is shown to a user.
+The RGB value is returned,  and may (or may not) be made use of. */
+
+static int remove_rgb_code( char *buff, int *offset)
+{
+   unsigned rval = (unsigned)-1;
+   size_t i;
+   char *loc = buff;
+
+   while( (loc = strchr( loc, '$')) != NULL)
+      {
+      i = 1;
+      while( i < 7 && isxdigit( loc[i]))
+         i++;
+      if( i == 7)    /* yes,  it's a $ followed by six hex digits */
+         {
+         sscanf( loc + 1, "%06x", &rval);
+         if( offset)
+            *offset = (int)( loc - buff);
+         memmove( loc, loc + 7, strlen( loc + 6));
+         return( (int)rval);
+         }
+      loc++;      /* loop to look for further '$'s   */
+      }
+   return( -1);
+}
+
 static void show_a_file( const char *filename, const int flags)
 {
-   FILE *ifile = fopen_ext( filename, "tclrb");
-   char buff[260], err_text[100];
+   FILE *ifile = fopen_ext( filename, "tcrb");
+   char buff[560], err_text[100];
    int line_no = 0, keep_going = 1;
    int n_lines = 0, msg_num = 0;
    bool search_text_found = true;
@@ -2280,9 +2602,11 @@ static void show_a_file( const char *filename, const int flags)
    char search_text[100];
    int calendar_line = -99, calendar_col = -1;
    int calendar_cell_width, calendar_cell_height;
+   int start_column = 0;
+   size_t max_column_shown = 0;
 
    if( !ifile)
-      ifile = fopen_ext( filename, "clrb");
+      ifile = fopen_ext( filename, "crb");
    if( !ifile)
       {
       snprintf_err( buff, sizeof( buff), "Couldn't open '%s'", filename);
@@ -2323,7 +2647,7 @@ static void show_a_file( const char *filename, const int flags)
       day_to_dmy( jd, &day, &month, &year, CALENDAR_GREGORIAN);
       day0 = (int)( jd - (long)day + 2) % 7;
       day0 += day - 1;
-      calendar_line = ((year - calendar_year0) + month - 1);
+      calendar_line = ((year - calendar_year0) * 12 + month - 1);
       calendar_line *= calendar_cell_height * 5 + 5;
       calendar_line += ((day0 / 7) % 5) * calendar_cell_height + 6;
       calendar_col = (day0 % 7) * calendar_cell_width;
@@ -2341,7 +2665,6 @@ static void show_a_file( const char *filename, const int flags)
       int top_line;
       int color_start = 18;      /* see 'command.txt' */
       short color_pair_idx = (short)color_start;
-      short color_idx = (short)color_start * 2;
       const bool color_visibility =
                   n_lines_to_show + color_start < COLORS;
 
@@ -2355,12 +2678,20 @@ static void show_a_file( const char *filename, const int flags)
          top_line = n_lines - n_lines_to_show;
       if( top_line < 0)
          top_line = 0;
+      if( start_column > (int)max_column_shown - COLS + 2)
+         start_column = (int)max_column_shown - COLS + 2;
+      if( start_column < 0)
+         start_column = 0;
+      max_column_shown = 0;
       if( is_ephem)
          {
          fseek( ifile, 0L, SEEK_SET);
          for( i = 0; i < 3; i++)
             {
             fgets_trimmed( buff, sizeof( buff), ifile);
+            if( max_column_shown < strlen( buff))
+               max_column_shown = strlen( buff);
+            drop_starting_columns( buff, start_column);
             put_colored_text( buff, i, 0, -1, COLOR_BACKGROUND);
             }
          }
@@ -2371,41 +2702,35 @@ static void show_a_file( const char *filename, const int flags)
          const int curr_line = top_line + i;
          int color_col[20], rgb[20], n_colored = 0, j;
 
-         if( i > 3 && flags && color_visibility)
-            {
-            char *tptr = buff;
-
-            while( (tptr = strchr( tptr, '$')) != NULL)
-               {
-               color_col[n_colored] = (int)(tptr - buff) - 7 * n_colored;
-               tptr++;
-               sscanf( tptr, "%6x", (unsigned *)rgb + n_colored);
-               n_colored++;
-               }
-            }
-         remove_rgb_code( buff);
+         while( (rgb[n_colored] = remove_rgb_code( buff, color_col + n_colored)) >= 0)
+            n_colored++;
+         if( i < 3)     /* don't try to 'colorize' top lines */
+            n_colored = 0;
+         if( max_column_shown < strlen( buff))
+            max_column_shown = strlen( buff);
+         drop_starting_columns( buff, start_column);
          if( i >= 3 || !is_ephem)
             put_colored_text( buff, i, 0, -1,
                (line_no == curr_line ? COLOR_ORBITAL_ELEMENTS : COLOR_BACKGROUND));
-         for( j = 0; j < n_colored; j++)
-            {
-            const int blue =  ((rgb[j] >> 3) & 0x1f);
-            const int green = ((rgb[j] >> 11) & 0x1f);
-            const int red =   ((rgb[j] >> 19) & 0x1f);
-            const int text_color = find_rgb(
-                              blue + red + green > 48 ? 0 : 0xffffff);
-
-            if( can_change_color( ))
-               {
-               init_color( color_idx, red * 999 / 31, green * 999 / 31, blue * 999 / 31);
-               init_pair( color_pair_idx, text_color, color_idx);
-               color_idx++;
-               }
-            else
-               init_pair( color_pair_idx, text_color, find_rgb( rgb[j]));
-            mvchgat( i, color_col[j], 2, A_NORMAL, color_pair_idx, NULL);
-            color_pair_idx++;
-            }
+         assert( n_colored < 2);
+         if( color_visibility)
+            for( j = 0; j < n_colored; j++)
+               if( color_col[j] >= start_column)
+                  {
+                  const int blue =  ((rgb[j] >> 3) & 0x1f);
+                  const int green = ((rgb[j] >> 11) & 0x1f);
+                  const int red =   ((rgb[j] >> 19) & 0x1f);
+                  const int text_color = find_rgb(
+                                    blue + red + green > 48 ? 0 : 0xffffff);
+
+#ifdef __PDCURSESMOD__
+                  init_extended_pair( color_pair_idx, text_color, find_rgb( rgb[j]));
+#else
+                  init_pair( color_pair_idx, text_color, find_rgb( rgb[j]));
+#endif
+                  mvchgat( i, color_col[j] - start_column, 2, A_NORMAL, color_pair_idx, NULL);
+                  color_pair_idx++;
+                  }
          if( calendar_col >= 0 && curr_line > calendar_line - 2
                    && curr_line < calendar_line + calendar_cell_height - 2)
             mvchgat( i, calendar_col + 1, calendar_cell_width - 1, 0, COLOR_OBS_INFO, NULL);
@@ -2497,6 +2822,21 @@ static void show_a_file( const char *filename, const int flags)
          case KEY_END:
             line_no = n_lines - 1;
             break;
+#ifdef KEY_B3
+         case KEY_B3:
+#endif
+         case KEY_RIGHT:
+         case 9:     /* tab */
+            start_column += 8;
+            break;
+#ifdef KEY_B1
+         case KEY_B1:
+#endif
+         case KEY_LEFT:
+         case KEY_BTAB:
+            if( start_column)
+               start_column = (start_column - 1) & ~0x7;
+            break;
          case KEY_A1:
          case KEY_HOME:
             line_no = top_possible_line;
@@ -2562,7 +2902,7 @@ static void show_a_file( const char *filename, const int flags)
                   fseek( ifile, 0L, SEEK_SET);
                   while( fgets( tbuff, sizeof( tbuff), ifile))
                      {
-                     remove_rgb_code( tbuff);
+                     remove_rgb_code( tbuff, NULL);
                      fputs( tbuff, ofile);
                      }
                   fclose( ofile);
@@ -2725,73 +3065,10 @@ static void put_colored_text( const char *text, const int line_no,
    attroff( color & attrib_mask);
 }
 
-OBSERVE *add_observations( FILE *ifile, OBSERVE *obs,
-                  const OBJECT_INFO *ids, int *n_obs)
-{
-   OBSERVE *obs2 = load_observations( ifile, ids->packed_desig, ids->n_obs);
-   extern int n_obs_actually_loaded;
-
-   if( debug_level)
-      printf( "Got %d new obs\n", n_obs_actually_loaded);
-   fclose( ifile);
-   obs = (OBSERVE *)realloc( obs,
-                 (*n_obs + n_obs_actually_loaded) * sizeof( OBSERVE));
-   memcpy( obs + *n_obs, obs2, n_obs_actually_loaded * sizeof( OBSERVE));
-   *n_obs += n_obs_actually_loaded;
-   free( obs2);
-   *n_obs = sort_obs_by_date_and_remove_duplicates( obs, *n_obs);
-   return( obs);
-}
-
 int find_first_and_last_obs_idx( const OBSERVE *obs, const int n_obs,
          int *last);       /* elem_out.cpp */
 double mid_epoch_of_arc( const OBSERVE *obs, const int n_obs);
 
-static double get_elements( const char *filename, double *state_vect)
-{
-   ELEMENTS elem;
-   FILE *ifile = fopen( filename, "rb");
-   char buff[82];
-
-   memset( &elem, 0, sizeof( ELEMENTS));
-   if( ifile)
-      {
-      while( fgets_trimmed( buff, sizeof( buff), ifile))
-         if( !memcmp( buff, "Epoch:", 6))
-            elem.epoch = get_time_from_string( 0., buff + 6,
-                     FULL_CTIME_YMD | CALENDAR_JULIAN_GREGORIAN, NULL);
-         else if( !memcmp( buff, "q:", 2))
-            elem.q = atof( buff + 2);
-         else if( !memcmp( buff, "e:", 2))
-            elem.ecc = atof( buff + 2);
-         else if( !memcmp( buff, "a:", 2))
-            elem.q = atof( buff + 2) * (1. - elem.ecc);
-         else if( !memcmp( buff, "i:", 2))
-            elem.incl = atof( buff + 2) * PI / 180;
-         else if( !memcmp( buff, "omega:", 6))
-            elem.arg_per = atof( buff + 6) * PI / 180;
-         else if( !memcmp( buff, "node:", 5))
-            elem.asc_node = atof( buff + 5) * PI / 180;
-         else if( !memcmp( buff, "M:", 2))
-            elem.mean_anomaly = atof( buff + 2) * PI / 180;
-         else if( !memcmp( buff, "L:", 2))
-            elem.mean_anomaly = atof( buff + 2) * PI / 180
-                        - elem.arg_per - elem.asc_node;
-         else if( !memcmp( buff, "pi:", 3))
-            elem.mean_anomaly = atof( buff + 3) * PI / 180
-                         - elem.arg_per;
-      fclose( ifile);
-      }
-   if( elem.epoch)
-      {
-      derive_quantities( &elem, SOLAR_GM);
-      elem.perih_time = elem.epoch - elem.mean_anomaly * elem.t0;
-      elem.angular_momentum = sqrt( SOLAR_GM * elem.q);
-      elem.angular_momentum *= sqrt( 1. + elem.ecc);
-      comet_posn_and_vel( &elem, elem.epoch, state_vect, state_vect + 3);
-      }
-   return( elem.epoch);
-}
 
 /* I really should use getopt() or a portable variant.  However,  this has
 been sufficiently effective thus far... */
@@ -2833,16 +3110,26 @@ static int find_rgb( const int irgb)
    rgb0[0] = (int)( irgb >> 16);
    rgb0[1] = (int)( (irgb >> 8) & 0xff);
    rgb0[2] = (int)( irgb & 0xff);
+#ifdef __PDCURSESMOD__
+   if( COLORS == 256 + (1 << 24))
+      return( 256 + rgb0[0] + (rgb0[1] << 8) + (rgb0[2] << 16));
+#endif
    if( COLORS <= 8 || force_eight_color_mode)
       return( (rgb0[0] > 127 ? 1 : 0) | (rgb0[1] > 127 ? 2 : 0)
                                       | (rgb0[2] > 127 ? 4 : 0));
-   if( !can_change_color( ) && COLORS >= 256)
+   if( COLORS >= 256)
       {
-      const int r_idx = (rgb0[0] + 10) / 50;
-      const int g_idx = (rgb0[1] + 10) / 50;
-      const int b_idx = (rgb0[2] + 10) / 50;
+      if( rgb0[0] == rgb0[1] && rgb0[0] == rgb0[2]    /* gray-scale */
+                                 && rgb0[0] > 4 && rgb0[0] < 247)
+         return( 232 + (rgb0[0] - 4) / 10);
+      else
+         {
+         const int r_idx = (rgb0[0] + 10) / 50;
+         const int g_idx = (rgb0[1] + 10) / 50;
+         const int b_idx = (rgb0[2] + 10) / 50;
 
-      return( 16 + b_idx + 6 * g_idx + 36 * r_idx);
+         return( 16 + b_idx + 6 * g_idx + 36 * r_idx);
+         }
       }
    for( i = 0; i < 3; i++)
       rgb0[i] = rgb0[i] * 200 / 51;
@@ -2875,7 +3162,7 @@ static int find_rgb( const int irgb)
       /* hope it works (it usually will)                          */
 static void PDC_set_title( const char *title)
 {
-   printf( "\033\x5d\x32;%s\a", title);
+   printf( OSC "\x32;%s\a", title);
    fflush( stdout);
 }
 #endif
@@ -2894,36 +3181,62 @@ static void set_color_table( void)
          unsigned fore_rgb, back_rgb;
 
          if( 3 == sscanf( buff + 1, "%d %x %x", &idx, &fore_rgb, &back_rgb))
+#ifdef __PDCURSESMOD__
+            init_extended_pair( idx, find_rgb( fore_rgb), find_rgb( back_rgb));
+#else
             init_pair( idx, find_rgb( fore_rgb), find_rgb( back_rgb));
+#endif
          }
    fclose( ifile);
 }
 
+static int *get_key_remap_table( void)
+{
+   FILE *ifile = fopen_ext( "command.txt", "fcrb");
+   char buff[90];
+   int *rval = (int *)calloc( 200, sizeof( int)), from, to;
+   size_t i = 0;
+
+   while( fgets( buff, sizeof( buff), ifile) && memcmp( buff, "Start re", 8))
+      ;
+   while( fgets( buff, sizeof( buff), ifile))
+      if( (from = get_character_code( buff)) > 0
+                  && (to = get_character_code( buff + 15)) > 0)
+         {
+         rval[i++] = from;
+         rval[i++] = to;
+         }
+   rval = (int *)realloc( rval, (i + 2) * sizeof( int));
+   fclose( ifile);
+   return( rval);
+}
+
 static SCREEN *screen_ptr;
 
-static inline int initialize_curses( const int argc, const char **argv)
+static inline int initialize_curses( void)
 {
 #ifdef __PDCURSES__
    ttytype[0] = 20;    /* Window must have at least 20 lines in Win32a */
    ttytype[1] = 55;    /* Window can have a max of 55 lines in Win32a */
    ttytype[2] = 70;    /* Window must have at least 70 columns in Win32a */
    ttytype[3] = (char)200; /* Window can have a max of 200 columns in Win32a */
-#else
-   PDC_set_title( get_find_orb_text( 18));
-#endif
 
+   PDC_set_title( get_find_orb_text( 18));
 #ifdef XCURSES
    resize_term( 50, 98);
-   Xinitscr( argc, (char **)argv);
-   screen_ptr = SP;
-#else
-   INTENTIONALLY_UNUSED_PARAMETER( argc);
-   INTENTIONALLY_UNUSED_PARAMETER( argv);
+#endif
+   screen_ptr = newterm( NULL, stdout, stdin);
+#else             /* not PDCurses,  assume ncurses */
 
-   char xterm_256color_name[20];
+   screen_ptr = NULL;
+   if( !force_eight_color_mode)
+      {
+      char xterm_256color_name[20];
 
-   strlcpy_error( xterm_256color_name, "xterm-256color");
-   if( force_eight_color_mode || !(screen_ptr = newterm( xterm_256color_name, stdout, stdin)))
+      strlcpy_error( xterm_256color_name, "xterm-256color");
+      screen_ptr = newterm( xterm_256color_name, stdout, stdin);
+      }
+   if( !screen_ptr)
       screen_ptr = newterm( NULL, stdout, stdin);
 #endif
    if( debug_level > 2)
@@ -2946,17 +3259,10 @@ static inline int initialize_curses( const int argc, const char **argv)
    PDC_set_title( get_find_orb_text( 18));
                               /* "Find_Orb -- Orbit Determination" */
 #endif
-#ifdef VT_RECEIVE_ALL_MOUSE
-   printf( VT_RECEIVE_ALL_MOUSE);
-#endif
+   _enable_mouse_movements( );
    if( debug_level > 2)
       debug_printf( "(3)\n");
    keypad( stdscr, 1);
-#ifdef MOUSE_MOVEMENT_EVENTS_ENABLED
-   mousemask( default_mouse_events | REPORT_MOUSE_POSITION, NULL);
-#else
-   mousemask( default_mouse_events, NULL);
-#endif
    set_color_table( );
    return( 0);
 }
@@ -3050,7 +3356,7 @@ static int user_select_file( char *filename, const char *title, const int flags)
 
          /* dialog and Xdialog take the same options : */
    full_endwin( );
-   sprintf( strchr( cmd, '~'), "~ %d %d",
+   snprintf_err( strchr( cmd, '~'), 12, "~ %d %d",
                           getmaxy( stdscr) - 15, getmaxx( stdscr) - 3);
    rval = try_a_file_dialog_program( filename, cmd + 1);
    restart_curses( );
@@ -3081,6 +3387,8 @@ static int count_wide_chars_in_utf8_string( const char *iptr, const char *endptr
 {
    int rval = 0;
 
+   assert( iptr);
+   assert( endptr >= iptr);
    while( iptr < endptr)
       {
       switch( ((unsigned char)*iptr) >> 4)
@@ -3142,6 +3450,7 @@ static bool filename_fits_current_os( const char *filename)
 }
 
 static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
+                    const size_t err_buff_size,
                     const bool drop_single_obs, const bool already_got_obs)
 {
    OBJECT_INFO *ids;
@@ -3149,6 +3458,7 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
    size_t n_lines, i;
    const char *prev_fn = "previous.txt";
    char **prev_files = load_file_into_memory( prev_fn, &n_lines, false);
+   bool is_temp_file = false;
 
    if( !prev_files)
       prev_files = load_file_into_memory( "previous.def", &n_lines, true);
@@ -3172,21 +3482,30 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
       {
       const size_t buffsize = 8000;
       char *buff = (char *)malloc( buffsize);
-      int c, base_key = (int)KEY_F( 4);
+      int c, base_key = (int)KEY_F( 5);
       size_t n_prev = 0, prev_idx[60];
       struct stat file_info;
       FILE *ifile;
-      const char *hotkeys = "0123456789abdeghijklmoprstuvwxyz;',./=-[]()*&^%$#@!:<>", *tptr;
+      const char *hotkeys = "0123456789abdeghijklmoprtuvwxyz;',./=-[]()*&^%$#@!:<>", *tptr;
 
       help_file_name = "openfile.txt";
       clear( );
-      ifile = fopen_ext( help_file_name, "fclrb");
+      ifile = fopen_ext( help_file_name, "fcrb");
       i = 0;
       while( fgets_trimmed( buff, buffsize, ifile) && *buff != '$')
          put_colored_text( buff, (int)i++, 0, -1, COLOR_BACKGROUND);
       fclose( ifile);
 
       strlcpy_err( buff, get_find_orb_text( 2031), buffsize);
+#ifdef _WIN32
+         {
+         char *sel_ptr = strstr( buff, "S ");
+
+         assert( sel_ptr);          /* remove 'selection' option; */
+         sel_ptr[-1] = '\0';        /* it doesn't work in Windows */
+         base_key--;
+         }
+#endif
       for( i = n_lines - 1; i && hotkeys[n_prev]
                                      && n_prev + 12 < (size_t)getmaxy( stdscr); i--)
          if( prev_files[i][0] != '#' && filename_fits_current_os( prev_files[i]))
@@ -3205,7 +3524,8 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
             }
       strlcat_err( buff, (already_got_obs ? "\nQ Cancel" : "\nQ Quit"), buffsize);
 
-      c = inquire( buff, NULL, 30, COLOR_DEFAULT_INQUIRY);
+      while( 'C' == (c = inquire( buff, NULL, 30, COLOR_DEFAULT_INQUIRY)))
+         show_calendar( );
       free( buff);
       if( c >= ' ' && c < 127)
          {
@@ -3223,10 +3543,7 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
          case 'F': case 'f': case KEY_F( 1):
             user_select_file( ifilename, "Open astrometry file", 0);
             break;
-         case 'C': case 'c': case KEY_F( 2):
-            strcpy( ifilename, "c");
-            break;
-         case 'N': case 'n': case KEY_F( 3):
+         case 'N': case 'n': case KEY_F( 2):
             {
             char object_name[83];
 
@@ -3243,6 +3560,14 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
                }
             }
             break;
+         case 'c': case KEY_F( 3):
+            strcpy( ifilename, "c");
+            break;
+#ifndef _WIN32
+         case 's': case KEY_F( 4):
+            strcpy( ifilename, "s");
+            break;
+#endif
          case 'q': case 'Q': case 27:
             free( prev_files);
             *err_buff = '\0';    /* signals 'cancel' */
@@ -3253,17 +3578,31 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
    if( !*ifilename)
       {
       free( prev_files);
-      strcpy( err_buff, "'findorb' needs the name of an input file of MPC-formatted\n"
-               "astrometry as a command-line argument.\n");
+      strlcpy_err( err_buff,
+               "'findorb' needs the name of an input file of MPC-formatted\n"
+               "astrometry as a command-line argument.\n", err_buff_size);
       return( NULL);
       }
 
-   if( !strcmp( ifilename, "c") || !strcmp( ifilename, "c+"))
+   if( !strcmp( ifilename, "c") || !strcmp( ifilename, "c+")
+          || !strcmp( ifilename, "s") || !strcmp( ifilename, "s+"))
       {
-      clipboard_to_file( temp_obs_filename, ifilename[1] == '+');
+      const int err_code = clipboard_to_file( temp_obs_filename, ifilename[1] == '+',
+                              *ifilename == 's');
+
+      if( err_code)
+         inquire( get_find_orb_text(
+#ifdef _WIN32
+                        2076  /* "Clipboard is empty" */
+#else
+                        2039  /* "You need xclip to get at the clipboard" */
+#endif
+                                    ), NULL, 0, COLOR_MESSAGE_TO_USER);
       strcpy( ifilename, temp_obs_filename);
+      is_temp_file = true;
       }
 
+   show_splash_screen( );
    ids = find_objects_in_file( ifilename, n_ids, NULL);
    if( *n_ids > 0 && drop_single_obs)
       {
@@ -3284,12 +3623,12 @@ static OBJECT_INFO *load_file( char *ifilename, int *n_ids, char *err_buff,
          err_msg = "Couldn't locate the file '%s'\n";
       else
          err_msg = "No objects found in file '%s'\n";
-      sprintf( err_buff, err_msg, ifilename);
+      snprintf_err( err_buff, err_buff_size, err_msg, ifilename);
       if( ids)
          free( ids);
       ids = NULL;
       }
-   else
+   else if( !is_temp_file)
       {
       FILE *ofile = fopen_ext( prev_fn, "fcw");
 #if defined( _WIN32)
@@ -3331,7 +3670,8 @@ static int non_grav_menu( char *message_to_user)
    static int models[] = { FORCE_MODEL_NO_NONGRAVS, FORCE_MODEL_SRP,
             FORCE_MODEL_SRP_TWO_PARAM, FORCE_MODEL_SRP_THREE_PARAM,
             FORCE_MODEL_COMET_TWO_PARAM, FORCE_MODEL_COMET_THREE_PARAM,
-            FORCE_MODEL_COMET_FOUR_PARAM, FORCE_MODEL_YARKO_A2 };
+            FORCE_MODEL_COMET_FOUR_PARAM, FORCE_MODEL_YARKO_A2,
+            FORCE_MODEL_DELTA_V };
    const size_t n_models = sizeof( models) / sizeof( models[0]);
 
    while( i < n_models && force_model != models[i])
@@ -3341,7 +3681,7 @@ static int non_grav_menu( char *message_to_user)
    _set_radio_button( buff, (int)i);
    help_file_name = "nongravs.txt";
    c = full_inquire( buff, NULL, 0, COLOR_MENU, -1, -1);
-   if( c >= KEY_F(1) && c <= KEY_F(8))
+   if( c >= KEY_F(1) && c <= KEY_F(9))
       c -= KEY_F( 1);
    else
       c -= '0';
@@ -3476,34 +3816,112 @@ static void setup_elements_dialog( char *buff, const char *constraints)
    fclose( ifile);
 }
 
+static void eop_info_text( char *buff, const size_t buffsize)
+{
+   int eop_range[3];
+
+   load_earth_orientation_params( NULL, eop_range);
+   if( eop_range[0])
+      {
+      char date_buff[3][50];
+      size_t i;
+
+      for( i = 0; i < 3; i++)
+         full_ctime( date_buff[i], 2400000.5 + (double)eop_range[i],
+               FULL_CTIME_DATE_ONLY | FULL_CTIME_YMD);
+      snprintf_err( buff, (int)buffsize,
+               "EOPs run from %s to %s\n(%s with extrapolation)\n",
+                        date_buff[0], date_buff[2], date_buff[1]);
+      }
+   else
+      strlcpy_err( buff, "No EOPs available\n", buffsize);
+}
+
+static void debias_info_text( char *buff, const size_t buffsize)
+{
+   const int debias_version = find_fcct_biases( 1., 1., 0,
+                           0., NULL, NULL);
+
+   if( debias_version > 2000)
+      {
+      const char *ver = "?unknown?\n";
+
+      strlcpy_err( buff, "Astrometric debiasing version ", buffsize);
+      if( debias_version == 2018)
+         ver = "EFCC18\n";
+      else if( debias_version == 2014)
+         ver = "FCCT14\n";
+      strlcat_err( buff, ver, buffsize);
+      }
+   else
+      strlcpy_err( buff, "No astrometric debiasing applied\n", buffsize);
+}
+
+static void moon_info_text( char *buff, const size_t buffsize)
+{
+   const double jd = current_jd( );
+   const double nm_time = jd - get_time_from_string( jd, "nm", 0, NULL);
+   const double fm_time = jd - get_time_from_string( jd, "fm", 0, NULL);
+   const bool is_fm = (fabs( nm_time) > fabs( fm_time));
+   const double dt = (is_fm ? fm_time : nm_time);
+
+   snprintf_err( buff, buffsize, "%.1f days %s %s moon", fabs( dt),
+                  (dt < 0. ? "until" : "after"),
+                  (is_fm ? "full" : "new"));
+}
+
 static void show_splash_screen( void)
 {
    FILE *ifile = fopen_ext( "splash.txt", "crb");
 
    if( ifile)
       {
-      char buff[200];
+      char buff[200], eop_line_1[200], *eop_line_2;
+      char debias_text[100], jpl_ephem_text[250];
+      char moon_text[90];
       bool show_it = false;
-
+      int lines, cols, i;
+
+      moon_info_text( moon_text, sizeof( moon_text));
+      debias_info_text( debias_text, sizeof( debias_text));
+      eop_info_text( eop_line_1, sizeof( eop_line_1));
+      eop_line_2 = strchr( eop_line_1, '\n');
+      if( eop_line_2)
+         *eop_line_2++ = '\0';
+      if( !format_jpl_ephemeris_info( jpl_ephem_text))
+         strlcpy_error( jpl_ephem_text, " No JPL DE ephemeris set up");
       clear( );
       while( !show_it && fgets( buff, sizeof( buff), ifile))
-         {
-         int lines, cols, i;
-
-         sscanf( buff, "%d %d", &lines, &cols);
-         show_it = (lines < LINES && cols < COLS);
-         for( i = 0; i < lines && fgets_trimmed( buff, sizeof( buff), ifile); i++)
-            if( show_it)
-               {
-               text_search_and_replace( buff, "$v", find_orb_version_jd( NULL));
-               put_colored_text( buff, (LINES - lines) / 2 + i, 0, -1, COLOR_BACKGROUND);
-               }
-         }
+         if( 2 == sscanf( buff, "%d %d", &lines, &cols))
+            {
+            show_it = (lines < LINES && cols < COLS);
+            for( i = 0; i < lines && fgets_trimmed( buff, sizeof( buff), ifile); i++)
+               if( show_it)
+                  {
+                  text_search_and_replace( buff, "$v", find_orb_version_jd( NULL));
+                  text_search_and_replace( buff, "$d", debias_text);
+                  text_search_and_replace( buff, "$m", moon_text);
+                  text_search_and_replace( buff, "$e1", eop_line_1);
+                  text_search_and_replace( buff, "$e2", (eop_line_2 ? eop_line_2 : ""));
+                  text_search_and_replace( buff, "$j", jpl_ephem_text + 1);
+                  put_colored_text( buff, (LINES - lines) / 2 + i, 0, -1, COLOR_BACKGROUND);
+                  }
+            }
       doupdate( );
       fclose( ifile);
       }
 }
 
+static void show_splash_screen_and_wait( void)
+{
+   _disable_mouse_movements( );
+   do
+      {
+      show_splash_screen( );
+      } while( KEY_RESIZE == extended_getch( ));
+   _enable_mouse_movements( );
+}
+
 static int find_command_area( const unsigned mouse_x, const unsigned mouse_y,
                               size_t *index)
 {
@@ -3565,11 +3983,21 @@ static int show_hint( const unsigned mouse_x, const unsigned mouse_y, size_t *in
       while( fgets_trimmed( buff, sizeof( buff), ifile)
                   && memcmp( buff, "Start h", 7))
          ;   /* just skip lines until we get to the section we want */
-      while( !got_it && fgets_trimmed( buff, sizeof( buff), ifile))
-         got_it = (get_character_code( buff) == cmd);
+      while( !got_it && fgets_trimmed( buff, sizeof( buff), ifile)
+                         && memcmp( buff, "Start re", 8))
+         if( *buff > ' ')
+            got_it = (get_character_code( buff) == cmd);
       fclose( ifile);
       if( got_it)
+         {
+         char hotkey[15];
+
+         memcpy( hotkey, buff, 15);
+         *strchr( hotkey, ' ') = '\0';
          memmove( buff, buff + 15, strlen( buff + 14));
+         if( hotkey[1] != '+')      /* skip the U+nnnn cases */
+            snprintf_append( buff, sizeof( buff), "\nHotkey for this is %s", hotkey);
+         }
       else
          *buff = '\0';
       if( *buff)      /* yes,  we have a hint to show */
@@ -3631,27 +4059,29 @@ int main( int argc, const char **argv)
    int element_format = 0, debug_mouse_messages = 0, prev_getch = 0;
    int auto_repeat_full_improvement = 0, n_ids = 0, planet_orbiting = 0;
    OBJECT_INFO *ids = NULL;
-   double noise_in_arcseconds = 1.;
+   double noise_in_sigmas = 1.;
    double monte_data[MONTE_DATA_SIZE];
    extern int monte_carlo_object_count;
    extern char default_comet_magnitude_type;
    extern double max_monte_rms;
-   extern int use_config_directory;          /* miscell.c */
    double max_residual_for_filtering = 2.5;
    bool show_commented_elements = false;
    bool drop_single_obs = true;
-   int sort_obs_by_code = 0;
+   int sort_obs_by_code = 0, *key_remaps;
    int n_stations_shown = 0, top_obs_shown = 0, n_obs_shown = 0;
-   bool single_obs_selected = false;
+   bool single_obs_selected = false, appending_observations = false;
    extern unsigned random_seed;
    unsigned mouse_x = (unsigned)-1, mouse_y = 0, mouse_z = 0;
    mmask_t button = 0;
 
    random_seed = get_random_seed( );
-   if( !strcmp( argv[0], "find_orb"))
-      use_config_directory = true;
-   else
-      use_config_directory = false;
+   for( i = 1; i < argc; i++)
+      if( argv[i][0] == '-' && argv[i][1] == 'x')
+         {
+         extern const char *alt_config_directory;
+
+         alt_config_directory = get_arg( argc, argv, i);
+         }
    ensure_config_directory_exists();
    if( !setlocale( LC_ALL, "C.UTF-8"))
       setlocale( LC_ALL, "en_US.utf8");
@@ -3746,6 +4176,13 @@ int main( int argc, const char **argv)
             case 'n':
                max_mpc_color_codes = atoi( arg);
                break;
+            case 'N':
+               {
+               extern const char *fullname_pattern;
+
+               fullname_pattern = arg;
+               }
+               break;
             case 'O':          /* write output files to specified dir */
                {
                extern const char *output_directory;
@@ -3762,6 +4199,13 @@ int main( int argc, const char **argv)
                process_count = atoi( arg);
                }
                break;
+            case 'P':
+               {
+               extern const char *desig_pattern;
+
+               desig_pattern = arg;
+               }
+               break;
             case 'q':
                {
                extern bool take_first_soln;
@@ -3790,6 +4234,8 @@ int main( int argc, const char **argv)
                      maximum_observation_jd =
                           get_time_from_string( 0., comma + 1,
                           FULL_CTIME_YMD | CALENDAR_JULIAN_GREGORIAN, NULL);
+                  else
+                     maximum_observation_jd = 1e+9;
                   }
                }
                break;
@@ -3815,7 +4261,9 @@ int main( int argc, const char **argv)
                state_vect_text = arg;
                }
                break;
-            case 'x':
+            case 'x':            /* handled above */
+               break;
+            case 'X':
                {
                extern bool saving_elements_for_reuse;
 
@@ -3829,14 +4277,6 @@ int main( int argc, const char **argv)
                n_extra_full_steps = atoi( arg);
                }
                break;
-            case 'z':
-               {
-               extern const char *alt_config_directory;
-
-               use_config_directory = true;
-               alt_config_directory = arg;
-               }
-               break;
             default:
                printf( "Unknown command-line option '%s'\n", argv[i]);
                return( -1);
@@ -3867,7 +4307,7 @@ int main( int argc, const char **argv)
 
    get_defaults( &ephemeris_output_options, &element_format,
          &element_precision, &max_residual_for_filtering,
-         &noise_in_arcseconds);
+         &noise_in_sigmas);
 
    strlcpy_err( ephemeris_start, get_environment_ptr( "EPHEM_START"),
                   sizeof( ephemeris_start));
@@ -3882,14 +4322,16 @@ int main( int argc, const char **argv)
 
    if( debug_level)
       debug_printf( "%d sigma recs read\n", i);
+   key_remaps = get_key_remap_table( );
 
-
-   initialize_curses( argc, argv);
+   initialize_curses( );
 
    *message_to_user = '\0';
    while( !quit)
       {
       int line_no = 0, mouse_wheel_motion;
+      extern bool saving_elements_for_reuse;
+      int top_line_to_blink = 0, bottom_line_to_blink = 0;
 
       prev_getch = c;
       while( get_new_file || get_new_object)
@@ -3899,7 +4341,7 @@ int main( int argc, const char **argv)
             OBJECT_INFO *new_ids;
             int n_new_ids;
 
-            new_ids = load_file( ifilename, &n_new_ids, tbuff, drop_single_obs,
+            new_ids = load_file( ifilename, &n_new_ids, tbuff, 200, drop_single_obs,
                                      (ids ? true : false));
             if( !new_ids && !*tbuff && !ids)   /* at startup,  and hit Quit */
                goto Shutdown_program;
@@ -3956,6 +4398,8 @@ int main( int argc, const char **argv)
                {
                FILE *ifile;
                long file_offset;
+               OBSERVE *prev_obs = obs;
+               int prev_n_obs = n_obs;
 
                strlcpy_error( obj_name, ids[id_number].obj_name);
                snprintf_err( tbuff, sizeof( tbuff), "Loading '%s'...", obj_name);
@@ -3974,7 +4418,10 @@ int main( int argc, const char **argv)
                if( file_offset < 0L)
                   file_offset = 0L;
                fseek( ifile, file_offset, SEEK_SET);
-               if( obs)
+               if( file_offset)        /* read and discard partial line */
+                  if( !fgets( tbuff, sizeof( tbuff), ifile))
+                     return( -4);
+               if( obs && !appending_observations)
                   unload_observations( obs, n_obs);
 
                strlcpy_error( tbuff, get_find_orb_text( 18));
@@ -3987,6 +4434,13 @@ int main( int argc, const char **argv)
                assert( obs);
                fclose( ifile);
                n_obs = ids[id_number].n_obs;
+               if( appending_observations)
+                  {
+                  obs = (OBSERVE *)realloc( obs, (n_obs + prev_n_obs) * sizeof( OBSERVE));
+                  memcpy( obs + n_obs, prev_obs, prev_n_obs * sizeof( OBSERVE));
+                  n_obs += prev_n_obs;
+                  shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, NULL);
+                  }
                if( !curr_epoch || !epoch_shown || !obs || n_obs < 2)
                   debug_printf( "Curr epoch %f; shown %f; obs %p; %d obs\n",
                                  curr_epoch, epoch_shown, (void *)obs, n_obs);
@@ -4040,6 +4494,7 @@ int main( int argc, const char **argv)
          bad_elements = write_out_elements_to_file( orbit, curr_epoch, epoch_shown,
              obs, n_obs, orbit_constraints, element_precision,
              is_monte_orbit, element_format);
+      saving_elements_for_reuse = false;
       is_monte_orbit = false;
       if( debug_level > 2)
          debug_printf( "elements written\n");
@@ -4051,11 +4506,9 @@ int main( int argc, const char **argv)
       line_no = n_command_lines + 1;
          {
          char *tptr = tbuff;
+         FILE *ofile = fopen_ext( "comments.txt", "tfcw");
 
          clock_line = 0;
-         if( sort_obs_by_code)
-            shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations,
-                                                   &sort_obs_by_code);
          generate_obs_text( obs, n_obs, tbuff, sizeof( tbuff));
          if( make_unicode_substitutions)
             {
@@ -4064,8 +4517,6 @@ int main( int argc, const char **argv)
                      /* cvt OEM degree symbol (0xf8) to U+00B0,  in UTF-8: */
                text_search_and_replace( tbuff, "\xf8", "\xc2\xb0 ");
             }
-         if( sort_obs_by_code)
-            shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, NULL);
          while( *tptr)
             {
             size_t i;
@@ -4079,12 +4530,14 @@ int main( int argc, const char **argv)
                add_cmd_area( '%', line_no, (unsigned)( tptr2 - tptr), 5);
             put_colored_text( tptr, line_no++, 0, -1,
                      (tptr[i + 1] ? COLOR_OBS_INFO : COLOR_OBS_INFO | A_UNDERLINE));
+            fprintf( ofile, "%s\n", tptr);
             tptr += i + 1;
             while( *tptr == 10 || *tptr == 13)
                tptr++;
             if( i < 72 && !clock_line)
                clock_line = line_no - 1;
             }
+         fclose( ofile);
          if( debug_level)
             refresh( );
          top_line_orbital_elements = line_no;
@@ -4100,9 +4553,9 @@ int main( int argc, const char **argv)
             unsigned right_side_col = 0;
             const unsigned spacing = 4;  /* allow four columns between */
                         /* 'standard' and 'extended' (right-hand) text */
-            int elem_color = (bad_elements ?
-                              A_BLINK + COLOR_OBS_INFO : COLOR_ORBITAL_ELEMENTS);
 
+            if( bad_elements)
+               top_line_to_blink = line_no + iline;
             while( iline < 20 && fgets_trimmed( tbuff, sizeof( tbuff), ifile))
                {
                if( show_commented_elements && *tbuff == '#')
@@ -4110,7 +4563,7 @@ int main( int argc, const char **argv)
                   if( tbuff[3] != '$' && memcmp( tbuff, "# Find", 6)
                                       && memcmp( tbuff, "# Scor", 6))
                      {
-                     put_colored_text( tbuff + 2, line_no + iline, 0, -1, elem_color);
+                     put_colored_text( tbuff + 2, line_no + iline, 0, -1, COLOR_ORBITAL_ELEMENTS);
                      iline++;
                      }
                   }
@@ -4120,8 +4573,11 @@ int main( int argc, const char **argv)
                   int n_chars_to_highlight = 0;
                   const char *reference = get_environment_ptr( "REFERENCE");
 
-                  if( !memcmp( tbuff, "IMPACT", 6))
-                     elem_color = COLOR_ATTENTION + A_BLINK;
+                  if( !memcmp( tbuff, "IMPACT", 6) && !top_line_to_blink)
+                     {
+                     top_line_to_blink = line_no + iline;
+                     bottom_line_to_blink = top_line_to_blink + 1;
+                     }
                   if( !memcmp( tbuff, "Epoch", 5))
                      add_cmd_area( 'e', line_no + iline, 0, 5);
                   if( !memcmp( tbuff + 3, "Peri", 4))
@@ -4130,7 +4586,9 @@ int main( int argc, const char **argv)
                   if( tptr)
                      add_cmd_area( 't', line_no + iline,
                                           (int)( tptr - tbuff), 20);
-                  tptr = strstr( tbuff, "(J2000 ");
+                  tptr = strstr( tbuff, "(J2000");
+                  if( !tptr)
+                     tptr = strstr( tbuff, "(body fr");
                   if( tptr)
                      add_cmd_area( ALT_N, line_no + iline,
                                           (int)( tptr - tbuff) - 3, 20);
@@ -4156,7 +4614,7 @@ int main( int argc, const char **argv)
                      text_search_and_replace( tbuff, " +/- ", " \xc2\xb1 ");
                      text_search_and_replace( tbuff, "^2", "\xc2\xb2");
                      }
-                  put_colored_text( tbuff, line_no + iline, 0, -1, elem_color);
+                  put_colored_text( tbuff, line_no + iline, 0, -1, COLOR_ORBITAL_ELEMENTS);
                   if( right_side_col < (unsigned)strlen( tbuff) + spacing)
                      right_side_col = (unsigned)strlen( tbuff) + spacing;
                   tptr = strstr( tbuff, "Earth MOID:");
@@ -4193,11 +4651,13 @@ int main( int argc, const char **argv)
                        || !memcmp( tbuff + 2, "MOID", 4))
                         {
                         put_colored_text( tbuff + 2, line_no + right_side_line,
-                                right_side_col, -1, elem_color);
+                                right_side_col, -1, COLOR_ORBITAL_ELEMENTS);
                         right_side_line++;
                         }
                }
             line_no += iline;
+            if( bad_elements)
+               bottom_line_to_blink = line_no;
             fclose( ifile);
             }
          if( debug_level)
@@ -4242,7 +4702,7 @@ int main( int argc, const char **argv)
          for( i = 0; i < n_mpc_codes; i++)
             mpc_color_codes[i].score = 0;
          show_observations( obs, top_obs_shown, top_line_residuals,
-                                 residual_format, n_obs_shown);
+                                 residual_format, n_obs_shown, n_obs);
          show_station_info( obs, n_obs,
                      line_no, curr_obs, list_codes);
 
@@ -4283,11 +4743,8 @@ int main( int argc, const char **argv)
       add_off_on = -1;
       move( getmaxy( stdscr) - 1, 0);
       if( c == AUTO_REPEATING)
-         if( curses_kbhit( ) != ERR)
-            {
-            extended_getch( );
-            c = 0;
-            }
+         if( (i = curses_kbhit_without_mouse( )) != ERR)
+            c = 0;                        /* stopping a Monte Carlo run */
       if( c != AUTO_REPEATING)
          {
          int n_ticks_elapsed = 0, n_ticks_mouse_stationary = 0;
@@ -4299,7 +4756,12 @@ int main( int argc, const char **argv)
                {
                c = extended_getch( );
                if( c == KEY_MOUSE)
+                  {
                   get_mouse_data( (int *)&mouse_x, (int *)&mouse_y, (int *)&mouse_z, &button);
+                  if( (button & BUTTON4_PRESSED) || button5_pressed)  /* 'wheel up'/'dn' */
+                     if( curses_kbhit( ) == KEY_MOUSE)
+                        c = 0;      /* avoid duplicated wheel mouse events */
+                  }
                }
             else
                {
@@ -4311,6 +4773,13 @@ int main( int argc, const char **argv)
                   tbuff[9] = '\0';
                   put_colored_text( tbuff, clock_line,
                                  getmaxx( stdscr) - 9, 9, COLOR_OBS_INFO);
+                  for( i = top_line_to_blink; i < bottom_line_to_blink; i++)
+                     {
+                     attr_t attrib = (t0 % 3) ? A_NORMAL : A_REVERSE;
+                     short color = (t0 % 3 == 2) ? COLOR_OBS_INFO : COLOR_ORBITAL_ELEMENTS;
+
+                     mvchgat( i, 0, getmaxx( stdscr), attrib, color, 0);
+                     }
                   }
                napms( 50);      /* a 'tick' is 50 milliseconds long */
                n_ticks_elapsed++;
@@ -4320,6 +4789,7 @@ int main( int argc, const char **argv)
                   {
                   size_t index;
                   const int cmd = show_hint( mouse_x, mouse_y, &index);
+                  int col1 = 0, col2 = 0;
 
                   if( cmd == -1)
                      {
@@ -4343,15 +4813,68 @@ int main( int argc, const char **argv)
                            buff[4] = '\0';
                            make_observatory_info_text( tbuff, sizeof( tbuff),
                                                        obs, n_obs, buff + 1);
+                           col2 = 5;
+                           }
+                        }
+                     else if( i >= 0)
+                        {
+                        i += top_obs_shown;
+                        if( mouse_x < 3)
+                           *tbuff = '\0';       /* nothing to do */
+                        else if( mouse_x < 20)
+                           {
+                           double dt, utc;
+
+                           utc = utc_from_td( obs[i].jd, NULL);
+                           dt = current_jd( ) - utc;
+
+                           full_ctime( tbuff, utc, CALENDAR_JULIAN_GREGORIAN
+                                      | FULL_CTIME_YMD | FULL_CTIME_LEADING_ZEROES
+                                      | FULL_CTIME_MICRODAYS);
+                           strcat( tbuff, " = ");
+                           full_ctime( tbuff + strlen( tbuff), utc,
+                                      FULL_CTIME_TIME_ONLY | FULL_CTIME_HUNDREDTH_SEC);
+                           if( dt < 1.)
+                              snprintf_append( tbuff, sizeof( tbuff), "\n%.2f hours ago", dt * 24.);
+                           else if( dt < 7.)
+                              snprintf_append( tbuff, sizeof( tbuff), "\n%.2f days ago", dt);
+                           if( utc > 2400001.0)
+                              snprintf_append( tbuff, sizeof( tbuff), "\nMJD %.6f", utc - 2400000.5);
+                           else
+                              snprintf_append( tbuff, sizeof( tbuff), "\nJD %.6f", utc);
+                           col1 = 3;
+                           col2 = 20;
+                           }
+                        else if( mouse_x < 44)
+                           {
+                           char formatted[82];
+
+                           recreate_observation_line( formatted, obs + i, 3 << 14);   /* HH MM SS.s */
+                           formatted[56] = '\0';
+                           strlcpy_error( tbuff, formatted + 32);
+                           strlcat_error( tbuff, "\n");
+                           recreate_observation_line( formatted, obs + i, 1 << 14);   /* decimal degrees */
+                           formatted[56] = '\0';
+                           strlcat_error( tbuff, formatted + 32);
+                           col1 = 20;
+                           col2 = 44;
+                           }
+                        else if( mouse_x < 52)
+                           {
+                           col1 = 44;
+                           col2 = 52;
+                           create_sigma_hover_text( tbuff, sizeof( tbuff), obs + i);
+                           }
+                        if( mouse_x >= 53 && mouse_x < 59 && obs[i].computed_mag != BLANK_MAG)
+                           {
+                           snprintf_err( tbuff, sizeof( tbuff), "computed mag %.2f",
+                                                            obs[i].computed_mag);
+                           col1 = 53;
+                           col2 = 59;
                            }
                         }
-#ifdef NOT_USED_YET                       /* To Do: show some info about this */
-                     else if( i >= 0)     /* observation.  Dunno what yet.    */
-                        snprintf_err( tbuff, 80, "line %d, obs %d",
-                                       i, i + top_obs_shown);
-#endif
                      if( *tbuff)
-                        show_hint_text( mouse_x, mouse_y, 0, 0, 0, tbuff);
+                        show_hint_text( mouse_x, mouse_y, mouse_y, col1, col2 - col1, tbuff);
                      }
                   }
                }
@@ -4360,7 +4883,9 @@ int main( int argc, const char **argv)
             }
          auto_repeat_full_improvement = 0;
          }
-
+      for( i = 0; key_remaps[i]; i += 2)
+         if( c == key_remaps[i])
+            c = key_remaps[i + 1];
       if( (button & BUTTON4_PRESSED) || button5_pressed)  /* 'wheel up'/'dn' */
          {
          mouse_wheel_motion = ((button & BUTTON_CTRL) ? 5 : 1);
@@ -4374,8 +4899,16 @@ int main( int argc, const char **argv)
       if( c == KEY_MOUSE && !(button & REPORT_MOUSE_POSITION))
          {
          c = find_command_area( mouse_x, mouse_y, NULL);
+         if( c == KEY_OBSCODE_CLICKED)
+            {
+            curr_obs = top_obs_shown + (mouse_y - top_line_residuals);
+            c = ( button & (BUTTON1_RELEASED | BUTTON1_CLICKED) ? 'T' : 'X');
+            }
          if( c == ALT_X && mouse_wheel_motion)
             c = (mouse_wheel_motion < 0 ? KEY_F( 4) : KEY_F( 5));
+         if( c == 't' && mouse_wheel_motion)
+            c = (mouse_wheel_motion < 0 ? KEY_CYCLE_RESID_DISPLAY_UP
+                                        : KEY_CYCLE_RESID_DISPLAY_DN);
          if( c < 0)      /* informational hint text; no command */
             c = KEY_MOUSE;
          }
@@ -4674,39 +5207,20 @@ int main( int argc, const char **argv)
             add_off_on = use_sigmas;
             }
             break;
-         case KEY_F(1):      /* turn on/off all obs prior to curr one */
-         case ALT_U:         /* Used because F1 doesn't work in X     */
-         case CTRL( 'W'):    /* Used because Alt-U doesn't work on Macs */
+#ifdef KEY_SUP
+         case KEY_SUP:
+#endif
+         case KEY_SR:
             obs[curr_obs].is_included ^= 1;
             for( i = 0; i < curr_obs; i++)
                obs[i].is_included = obs[curr_obs].is_included;
             strlcpy_error( message_to_user, get_find_orb_text( 20));
             add_off_on = obs[curr_obs].is_included;
             break;
-         case KEY_F(16):     /* Shift-F4:  select another object to add in */
-            if( (i = select_object_in_file( ids, n_ids)) >= 0)
-               {
-               FILE *ifile = fopen( ifilename, "rb");
-
-               obs = add_observations( ifile, obs, ids + i, &n_obs);
-               if( debug_level)
-                  printf( "Now have %d obs\n", n_obs);
-               if( mpc_color_codes)
-                  free( mpc_color_codes);
-               if( max_mpc_color_codes)
-                  mpc_color_codes = find_mpc_color_codes( n_obs, obs,
-                             max_mpc_color_codes);
-               if( debug_level)
-                  debug_printf( "got color codes; ");
-               for( i = 0; i < n_obs - 1 && !obs[i].is_included; i++)
-                  ;
-               curr_obs = i;
-               set_locs( orbit, curr_epoch, obs, n_obs);
-               update_element_display = 1;
-               clear( );
-               }
-            break;
-         case KEY_F(2):          /* turn on/off all obs after curr one */
+#ifdef KEY_SDOWN
+         case KEY_SDOWN:
+#endif
+         case KEY_SF:            /* turn on/off all obs after curr one */
             obs[curr_obs].is_included ^= 1;
             for( i = curr_obs; i < n_obs; i++)
                obs[i].is_included = obs[curr_obs].is_included;
@@ -4751,8 +5265,29 @@ int main( int argc, const char **argv)
          case '^':
             non_grav_menu( message_to_user);
             if( *message_to_user)      /* new force model selected */
+               {
+               extern int force_model;
+               char *delta_v = NULL;
+
                for( i = 6; i < n_orbit_params; i++)
                   orbit[i] = 0.;
+               if( force_model == FORCE_MODEL_DELTA_V)
+                  {        /* we need a starting estimate of the maneuver time */
+                  if( !inquire( get_find_orb_text( 2099), tbuff, sizeof( tbuff),
+                            COLOR_DEFAULT_INQUIRY) && *tbuff)
+                     {
+                     delta_v = strstr( tbuff, "v=");
+                     if( delta_v)
+                        *delta_v = '\0';
+                     orbit[9] = get_time_from_string( obs->jd, tbuff,
+                             FULL_CTIME_YMD | CALENDAR_JULIAN_GREGORIAN, NULL);
+                     }
+                  if( orbit[9] < obs->jd || orbit[9] > obs[n_obs - 1].jd)
+                     force_model = FORCE_MODEL_NO_NONGRAVS;
+                  else if( delta_v)
+                     sscanf( delta_v + 2, "%lf,%lf,%lf", orbit + 6, orbit + 7, orbit + 8);
+                  }
+               }
             break;
 #ifndef _WIN32
          case KEY_F(8):     /* show original screens */
@@ -4866,14 +5401,14 @@ int main( int argc, const char **argv)
 
                set_statistical_ranging( c == CTRL( 'A'));
                c = '|';
-               if( !inquire( "Gaussian noise level (arcsec): ",
+               if( !inquire( "Gaussian noise level (sigmas): ",
                              tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY))
                   {
-                  noise_in_arcseconds = atof( tbuff);
-                  if( noise_in_arcseconds)
+                  noise_in_sigmas = atof( tbuff);
+                  if( noise_in_sigmas)
                      {
                      max_monte_rms =
-                              sqrt( noise_in_arcseconds * noise_in_arcseconds
+                              sqrt( noise_in_sigmas * noise_in_sigmas
                                            + rms * rms);
                      c = AUTO_REPEATING;
                      }
@@ -4881,11 +5416,14 @@ int main( int argc, const char **argv)
                }
             if( c == AUTO_REPEATING)
                stored_ra_decs =
-                   add_gaussian_noise_to_obs( n_obs, obs, noise_in_arcseconds);
+                   add_gaussian_noise_to_obs( n_obs, obs, noise_in_sigmas);
             push_orbit( curr_epoch, orbit);
             if( c == AUTO_REPEATING && using_sr)
                {
-               find_nth_sr_orbit( orbit, obs, n_obs, monte_carlo_object_count);
+               sr_orbit_t sr;
+
+               find_nth_sr_orbit( &sr, obs, n_obs, monte_carlo_object_count);
+               memcpy( orbit, sr.orbit, 6 * sizeof( double));
                adjust_herget_results( obs, n_obs, orbit);
                         /* epoch is that of first included observation: */
                get_epoch_range_of_included_obs( obs, n_obs, &curr_epoch, NULL);
@@ -4897,7 +5435,6 @@ int main( int argc, const char **argv)
 //             const double mid_epoch = curr_epoch;
 //             const double mid_epoch = epoch_shown;
 
-//             debug_printf( "From %.7f to %.7f\n", curr_epoch, mid_epoch);
                memcpy( saved_orbit, orbit, n_orbit_params * sizeof( double));
                integrate_orbit( orbit, curr_epoch, mid_epoch);
                         /* Only request sigmas for i=1 (last pass... */
@@ -4951,7 +5488,7 @@ int main( int argc, const char **argv)
                   {
                   elem.gm = get_planet_mass( planet_orbiting);
                   calc_classical_elements( &elem, rel_orbit, epoch_shown, 1);
-                  add_monte_orbit( monte_data, &elem, monte_carlo_object_count);
+                  add_monte_orbit( monte_data, &elem, orbit2, monte_carlo_object_count);
                   }
                if( monte_carlo_object_count > 3)
                   {
@@ -4972,6 +5509,8 @@ int main( int argc, const char **argv)
                {
                strlcpy_error( message_to_user,
                                (err ? "Full step FAILED" : "Full step taken"));
+               if( curses_kbhit_without_mouse( ) != ERR)
+                  strlcpy_error( message_to_user, "User interrupted step");
                snprintf_append( message_to_user, sizeof( message_to_user), "(%.5f s)",
                       (double)( clock( ) - t0) / (double)CLOCKS_PER_SEC);
                }
@@ -5099,6 +5638,7 @@ int main( int argc, const char **argv)
                strlcpy_error( orbit_constraints, "e=1,i=72,O=72");
             if( !strcmp( orbit_constraints, "Ma"))
                strlcpy_error( orbit_constraints, "e=1,i=26,O=81"); /* q=.049? */
+            compute_effective_solar_multiplier( orbit_constraints);
             break;
          case 'm': case 'M':
             create_obs_file( obs, n_obs, 0, residual_format);
@@ -5106,11 +5646,14 @@ int main( int argc, const char **argv)
                            ifilename, residual_format);
             break;
          case 'o':             /* select a new file */
+         case 'O':             /* append observations */
             get_new_file = get_new_object = true;
+            appending_observations = (c == 'O');
             *ifilename = '\0';
             break;
          case 'n': case 'N':   /* select a new object from the input file */
             get_new_object = true;
+            appending_observations = (c == 'N');
             update_element_display = 1;
             pop_all_orbits( );
             break;
@@ -5161,39 +5704,62 @@ int main( int argc, const char **argv)
          case ALT_F:
             {
             extern double **eigenvects;
-            const double n_sigmas = improve_along_lov( orbit, curr_epoch,
+
+            if( eigenvects && eigenvects[0])
+               {
+               const double n_sigmas = improve_along_lov( orbit, curr_epoch,
                      eigenvects[0], n_orbit_params, n_obs, obs);
 
-            snprintf( message_to_user, sizeof( message_to_user),
+               snprintf( message_to_user, sizeof( message_to_user),
                                        "Adjusted by %f sigmas", n_sigmas);
-            update_element_display = 1;
+               update_element_display = 1;
+               }
+            else
+               strlcpy_error( message_to_user, "No LOV along which to improve");
             }
             break;
          case CTRL( 'D'):
             if( !inquire( "Number SR orbits: ", tbuff, sizeof( tbuff),
-                            COLOR_DEFAULT_INQUIRY) && atoi( tbuff))
+                            COLOR_DEFAULT_INQUIRY))
                {
-               const unsigned max_orbits = atoi( tbuff);
-               double *orbits = (double *)calloc( max_orbits, 7 * sizeof( double));
-               int n_found;
+               unsigned max_orbits, n_improvements = 0;
 
-               for( i = 0; i < n_obs - 1 && !obs[i].is_included; i++)
-                  ;
-               n_found = get_sr_orbits( orbits, obs + i, n_obs - i, 0, max_orbits,
-                        86400., 1., 1);
-               snprintf_err( message_to_user, sizeof( message_to_user),
-                                "%d orbits computed: best score=%.3f\n",
-                                n_found, orbits[6]);
-               if( n_found)
+               if( sscanf( tbuff, "%u,%u", &max_orbits, &n_improvements))
                   {
-                  push_orbit( curr_epoch, orbit);
-                  memcpy( orbit, orbits, 6 * sizeof( double));
-                  curr_epoch = obs[i].jd;
-                  update_element_display = 1;
-                  set_locs( orbit, curr_epoch, obs, n_obs);
-                  show_a_file( "sr_elems.txt", 0);
+                  sr_orbit_t *orbits = (sr_orbit_t *)calloc( max_orbits, sizeof( sr_orbit_t));
+                  int n_found;
+
+                  for( i = 0; i < n_obs - 1 && !obs[i].is_included; i++)
+                     ;
+                  n_found = get_sr_orbits( orbits, obs + i, n_obs - i, 0, max_orbits,
+                           86400., 1., 1);
+                  snprintf_err( message_to_user, sizeof( message_to_user),
+                                   "%d orbits computed: best score=%.3f\n",
+                                   n_found, orbits[0].score);
+                  debug_printf( "%d found, will do %u improvements\n",
+                              n_found, n_improvements);
+                  if( n_found > 0)
+                     {
+                     while( n_improvements--)
+                        improve_sr_orbits( orbits, obs + i,
+                                    n_obs - i, n_found, 1., 0);
+                     curr_epoch = obs[i].jd;
+                     for( i = 0; i < n_found; i++)
+                        if( orbits[i].score < orbits[0].score)
+                           {
+                           const sr_orbit_t torbit = orbits[0];
+
+                           orbits[0] = orbits[i];
+                           orbits[i] = torbit;
+                           }
+                     push_orbit( curr_epoch, orbit);
+                     memcpy( orbit, orbits[0].orbit, 6 * sizeof( double));
+                     update_element_display = 1;
+                     set_locs( orbit, curr_epoch, obs, n_obs);
+                     show_a_file( "sr_elems.txt", 0);
+                     }
+                  free( orbits);
                   }
-               free( orbits);
                }
             break;
          case CTRL( 'R'):
@@ -5296,19 +5862,38 @@ int main( int argc, const char **argv)
 //                               orbit2[0], orbit2[1], orbit2[2]);
 //             debug_printf( "%20.14f %20.14f %20.14f\n",
 //                               orbit2[3], orbit2[4], orbit2[5]);
-               store_solution( obs, n_obs, orbit2, epoch_shown,
-                                          perturbers);
                }
             }
             break;
-         case 't': case 'T':
+         case 't':
             residual_format = resid_format_menu( message_to_user, residual_format);
             if( *message_to_user)
                update_element_display = 1;
             break;
-         case 127:           /* backspace takes on different values */
-         case KEY_BACKSPACE: /* on PDCurses,  ncurses,  etc.        */
-         case 8:
+         case 'T':
+            snprintf_err( message_to_user, sizeof( message_to_user),
+                                       "%u observation(s) in tracklet",
+                      select_tracklet( obs, n_obs, curr_obs));  /* orb_func.cpp */
+            break;
+         case KEY_CYCLE_RESID_DISPLAY_UP:
+            if( residual_format & RESIDUAL_FORMAT_NORMALIZED)
+                residual_format ^= RESIDUAL_FORMAT_NORMALIZED;
+            else if( residual_format & RESIDUAL_FORMAT_TIME_RESIDS)
+                residual_format ^= (RESIDUAL_FORMAT_NORMALIZED | RESIDUAL_FORMAT_TIME_RESIDS);
+            else
+                residual_format ^= RESIDUAL_FORMAT_TIME_RESIDS;
+            update_element_display = 1;
+            break;
+         case KEY_CYCLE_RESID_DISPLAY_DN:
+            if( residual_format & RESIDUAL_FORMAT_NORMALIZED)
+                residual_format ^= (RESIDUAL_FORMAT_NORMALIZED | RESIDUAL_FORMAT_TIME_RESIDS);
+            else if( residual_format & RESIDUAL_FORMAT_TIME_RESIDS)
+                residual_format ^= RESIDUAL_FORMAT_TIME_RESIDS;
+            else
+                residual_format ^= RESIDUAL_FORMAT_NORMALIZED;
+            update_element_display = 1;
+            break;
+         case KEY_BACKSPACE:
             if( !pop_orbit( &curr_epoch, orbit))
                {
                strlcpy_error( message_to_user, "Last orbit operation undone");
@@ -5333,8 +5918,11 @@ int main( int argc, const char **argv)
                   vaisala_dist /= AU_IN_KM;        /* to be in kilometers */
                if( vaisala_dist)
                   {
-                  curr_epoch = obs->jd;
-                  find_vaisala_orbit( orbit, obs, obs + n_obs - 1, vaisala_dist);
+                  int idx1, idx2;
+
+                  get_idx1_and_idx2( n_obs, obs, &idx1, &idx2);
+                  curr_epoch = obs[idx1].jd;
+                  find_vaisala_orbit( orbit, obs + idx1, obs + idx2, vaisala_dist);
                   update_element_display = 1;
                   set_locs( orbit, curr_epoch, obs, n_obs);
                   }
@@ -5450,13 +6038,29 @@ int main( int argc, const char **argv)
             strlcpy_error( message_to_user, "Worst observation found");
             }
             break;
-         case 'x': case 'X':
+         case 'X':         /* toggle tracklet */
+            for( i = 0; i < n_obs; i++)
+               if( obs[i].flags & OBS_IS_SELECTED)
+                  obs[i].flags |= OBS_TEMP_USE_FLAG;
+               else
+                  obs[i].flags &= ~OBS_TEMP_USE_FLAG;
+            select_tracklet( obs, n_obs, curr_obs);  /* orb_func.cpp */
+                     /* FALLTHRU */
+         case 'x':
             {
             unsigned n_found;
 
             add_off_on = toggle_selected_observations( obs, n_obs, &n_found);
             snprintf_err( message_to_user, sizeof( message_to_user),
                                        "%u observation(s) toggled", n_found);
+            if( c == 'X')     /* restore original selection */
+               for( i = 0; i < n_obs; i++)
+                  {
+                  if( obs[i].flags & OBS_TEMP_USE_FLAG)
+                     obs[i].flags |= OBS_IS_SELECTED;
+                  else
+                     obs[i].flags &= ~OBS_IS_SELECTED;
+                  }
             }
             break;
          case 'y': case 'Y':
@@ -5486,6 +6090,8 @@ int main( int argc, const char **argv)
                               sqrt( delta_squared) * AU_IN_KM,
                               (unsigned long)( t0 / one_billion),
                               (unsigned long)( t0 % one_billion));
+            snprintf_append( message_to_user, sizeof( message_to_user),
+                     " JD %.4f to %.4f", curr_epoch, curr_epoch + atof( tbuff));
             }
             break;
          case ALT_D:
@@ -5617,15 +6223,6 @@ int main( int argc, const char **argv)
                                tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY))
                show_a_file( tbuff, 0);
             break;
-         case '`':
-            {
-            default_comet_magnitude_type =
-                        'N' + 'T' - default_comet_magnitude_type;
-            if( default_comet_magnitude_type == 'N')
-               strlcpy_error( message_to_user, "Using nuclear mags for comets");
-            else
-               strlcpy_error( message_to_user, "Using total mags for comets");
-            }
          case KEY_MOUSE:   /* already handled above */
             break;
          case 'b':
@@ -5686,46 +6283,14 @@ int main( int argc, const char **argv)
          case ',':
             show_a_file( "debug.txt", 0);
             break;
-         case '.':
+         case KEY_F( 15):        /* shift-f3 : show Curses info */
             {
-            int eop_range[3];
-            const int debias_version = find_fcct_biases( 1., 1., 0,
-                           0., NULL, NULL);
-
             snprintf_err( tbuff, sizeof( tbuff), "%s\n%s\n%s\n",
                                  longname( ), termname( ), curses_version( ));
             snprintf_append( tbuff, sizeof( tbuff),
                         "%d pairs of %d colors\n", COLOR_PAIRS, COLORS);
             if( can_change_color( ))
                strlcat_error( tbuff, "Colors are changeable\n");
-            snprintf_append( tbuff, sizeof( tbuff), "Find_Orb version %s\n",
-                             find_orb_version_jd( NULL));
-            format_jpl_ephemeris_info( tbuff + strlen( tbuff) - 1);
-            load_earth_orientation_params( NULL, eop_range);
-            if( eop_range[0])
-               {
-               char date_buff[3][50];
-
-               for( i = 0; i < 3; i++)
-                  full_ctime( date_buff[i], 2400000.5 + (double)eop_range[i],
-                        FULL_CTIME_DATE_ONLY | FULL_CTIME_YMD);
-               snprintf_append( tbuff, sizeof( tbuff),
-                        "EOPs run from %s to %s\n(%s with extrapolation)\n",
-                                 date_buff[0], date_buff[2], date_buff[1]);
-               }
-            if( debias_version > 2000)
-               {
-               const char *ver = "?unknown?\n";
-
-               strlcat_error( tbuff, "Astrometric debiasing version ");
-               if( debias_version == 2018)
-                  ver = "EFCC18\n";
-               else if( debias_version == 2014)
-                  ver = "FCCT14\n";
-               strlcat_error( tbuff, ver);
-               }
-            else
-               strlcat_error( tbuff, "No astrometric debiasing applied\n");
             inquire( tbuff, NULL, 0, COLOR_DEFAULT_INQUIRY);
             }
             break;
@@ -5828,19 +6393,6 @@ int main( int argc, const char **argv)
                            (c == ALT_T ? "all" : "selected"));
                   }
             break;
-         case KEY_F(17):    /* shift-f5 */
-            if( !inquire( "Enter element filename: ", tbuff, sizeof( tbuff),
-                                COLOR_DEFAULT_INQUIRY) && *tbuff)
-               {
-               const double rval = get_elements( tbuff, orbit);
-
-               if( rval)
-                  {
-                  curr_epoch = epoch_shown = rval;
-                  update_element_display = 1;
-                  }
-               }
-            break;
          case KEY_F(23):    /* shift-f11: ephemeride-less pseudo-MPEC */
             {
             extern const char *ephemeris_filename;
@@ -5850,8 +6402,6 @@ int main( int argc, const char **argv)
 
             memcpy( orbit2, orbit, n_orbit_params * sizeof( double));
             integrate_orbit( orbit2, curr_epoch, epoch_shown);
-            store_solution( obs, n_obs, orbit2, epoch_shown,
-                                          perturbers);
             create_obs_file( obs, n_obs, 0, residual_format);
 #ifdef _WIN32                /* MS is different. */
             _unlink( get_file_name( tbuff, ephemeris_filename));
@@ -5891,7 +6441,7 @@ int main( int argc, const char **argv)
                else
                   {
                   const double jd = get_time_from_string( obs[curr_obs].jd,
-                                 tbuff, 0, NULL);
+                                 tbuff, CALENDAR_JULIAN_GREGORIAN, NULL);
 
                   if( jd)
                      for( curr_obs = 0; curr_obs < n_obs &&
@@ -5996,9 +6546,23 @@ int main( int argc, const char **argv)
             update_element_display = 1;
             break;
          case ALT_G:
-            orbital_monte_carlo( orbit, obs, n_obs, curr_epoch, epoch_shown);
-            update_element_display = 1;
-            strlcpy_error( message_to_user, "Orbital MC generated");
+            if( !inquire( get_find_orb_text( 2101),
+                               tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY))
+               {
+               const unsigned new_n_orbits = atoi( tbuff);
+
+               if( new_n_orbits)
+                  {
+                  extern unsigned max_n_sr_orbits;
+
+                  max_n_sr_orbits = new_n_orbits;
+                  reset_sr_orbits( );
+                  orbital_monte_carlo( orbit, obs, n_obs, curr_epoch, epoch_shown);
+                  update_element_display = 1;
+                  strlcpy_error( message_to_user, "Orbital MC generated");
+                  }
+               }
+            break;
             break;
          case ALT_I:
             {
@@ -6015,9 +6579,23 @@ int main( int argc, const char **argv)
             {
             extern int sigmas_in_columns_57_to_65;
 
-            sigmas_in_columns_57_to_65 ^= 1;
             strlcpy_error( message_to_user, "Sigma display");
-            add_off_on = sigmas_in_columns_57_to_65;
+            if( residual_format & RESIDUAL_FORMAT_SHOW_DESIGS)
+               {
+               residual_format ^= RESIDUAL_FORMAT_SHOW_DESIGS;
+               sigmas_in_columns_57_to_65 = 0;
+               }
+            else
+               {
+               sigmas_in_columns_57_to_65 ^= 1;
+               if( !sigmas_in_columns_57_to_65)
+                  {
+                  residual_format |= RESIDUAL_FORMAT_SHOW_DESIGS;
+                  strlcpy_error( message_to_user, "Showing packed desigs in obs area");
+                  }
+               }
+            if( message_to_user[1] == 'i')
+               add_off_on = sigmas_in_columns_57_to_65;
             }
             break;
          case ALT_Q:
@@ -6036,9 +6614,6 @@ int main( int argc, const char **argv)
             strlcpy_error( message_to_user, sort_obs_by_code ?
                      "Obs sorted by MPC code" : "Obs sorted by date");
             break;
-         case ALT_A:
-            residual_format ^= RESIDUAL_FORMAT_SHOW_DESIGS;
-            break;
          case ALT_R:
             if( !inquire( get_find_orb_text( 2038),
                                tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY))
@@ -6088,11 +6663,9 @@ int main( int argc, const char **argv)
             break;
          case CTRL( 'X'):
             {
-            extern bool saving_elements_for_reuse;
-
-            saving_elements_for_reuse ^= 1;
-            strlcpy_error( message_to_user, "Saving elements for re-use is");
-            add_off_on = saving_elements_for_reuse;
+            saving_elements_for_reuse = true;
+            strlcpy_error( message_to_user, "Elements saved for re-use");
+            update_element_display = 1;
             }
             break;
          case CTRL( 'Y'):
@@ -6109,11 +6682,7 @@ int main( int argc, const char **argv)
                single_obs_selected = true;
                }
             break;
-#ifdef CTL_DOWN        /* PDCurses uses this #define */
-         case CTL_DOWN:
-#else                  /* ncurses uses this #define */
          case CTL_DN:
-#endif
             if( curr_obs < n_obs - 1)
                {
                curr_obs++;
@@ -6141,44 +6710,118 @@ int main( int argc, const char **argv)
             }
             break;
          case 'c': case 'C':
+            show_calendar( );
+            break;
+         case '.':
+            show_splash_screen_and_wait( );     /* just to test */
+            break;
+         case ALT_Y:
             {
-            FILE *ifile = fopen_ext( "calend.txt", "clrb");
+            char object_name[80];
+            double unused_max_resid;
+            ELEMENTS elems;
 
-            if( ifile)
-               fclose( ifile);
-            show_a_file( (ifile ? "calend.txt" : "calendar.txt"), SHOW_FILE_IS_CALENDAR);
+            get_object_name( object_name, obs->packed_id);
+            if( get_orbit_from_mpcorb_sof( object_name, orbit,
+                               &elems, 0.1, &unused_max_resid))
+               {
+               curr_epoch = epoch_shown = elems.epoch;
+               update_element_display = 1;
+               set_locs( orbit, curr_epoch, obs, n_obs);
+               strlcpy_error( message_to_user, "Elements copied from 'mpcorb.sof'");
+               }
+            else
+               snprintf_err( message_to_user, sizeof( message_to_user),
+                       "Didn't find elems for '%s' in 'mpcorb.sof'", object_name);
             }
             break;
-         case KEY_F( 15):        /* shift-f3 */
-            show_splash_screen( );     /* just to test */
-            extended_getch( );
+         case 'j': case 'J':
+            {
+            extern int object_type;
+            const char *text;
+
+            if( object_type == OBJECT_TYPE_ASTEROID)
+               {
+               object_type = OBJECT_TYPE_COMET;
+               default_comet_magnitude_type = 'T';
+               text = "comet total";
+               }
+            else if( default_comet_magnitude_type == 'T')
+               {
+               default_comet_magnitude_type = 'N';
+               text = "comet nuclear";
+               }
+            else
+               {
+               object_type = OBJECT_TYPE_ASTEROID;
+               text = "asteroid";
+               }
+            calc_absolute_magnitude( obs, n_obs);
+            snprintf_err( message_to_user, sizeof( message_to_user),
+                       "Using %s mag model", text);
+            update_element_display = 1;
+            }
             break;
          case '\\':
-         case 'j': case 'J':
-         case 'O':
-         case ';': case ']':
+            if( !inquire( "Enter Kreutz perihelion distance:",
+                       tbuff, sizeof( tbuff), COLOR_DEFAULT_INQUIRY) && *tbuff)
+               {
+               const double r = find_kreutz_orbit( obs + curr_obs, 1, orbit, atof( tbuff));
+
+               snprintf_err( message_to_user, sizeof( message_to_user),
+                       "Kreutz r = %f AU", r);
+               curr_epoch = obs[curr_obs].jd - r / AU_PER_DAY;
+               set_locs( orbit, curr_epoch, obs, n_obs);
+               update_element_display = 1;
+               }
+            break;
+         case KEY_DC:            /* 'delete' selected observations */
+            {
+            int j;
+
+            for( i = 0, j = 0; i < n_obs; i++)
+               if( !(obs[i].flags & OBS_IS_SELECTED))
+                  obs[j++] = obs[i];
+               else if( i < curr_obs)
+                     curr_obs--;
+            if( n_obs > 0)
+               {
+               n_obs = j;
+               if( curr_obs >= n_obs)
+                  curr_obs = n_obs - 1;
+               }
+            obs[curr_obs].flags |= OBS_IS_SELECTED;
+            snprintf_err( message_to_user, sizeof( message_to_user),
+                     "%d selected observations removed", i - j);
+            update_element_display = 1;
+            }
+            break;
+         case ';': case ']': case '`':
          case CTRL( 'E'): case CTRL( 'J'): case CTRL( 'L'):
-         case CTRL( 'N'): case CTRL( 'O'): case CTRL( 'T'):
-         case CTRL( 'V'):
+         case CTRL( 'N'): case CTRL( 'O'): case CTRL( 'Q'):
+         case CTRL( 'S'): case CTRL( 'T'): case CTRL( 'U'):
+         case CTRL( 'V'): case CTRL( 'W'): case CTRL( 'Z'):
          case CTRL( '_'): case CTRL( ']'):
-         case ALT_Y:
+         case ALT_A:
          case CTL_LEFT: case CTL_RIGHT:
+         case KEY_F( 1):
+         case KEY_F( 2):
          case KEY_F( 13):        /* shift-f1 */
          case KEY_F( 14):        /* shift-f2 */
+         case KEY_F( 16):        /* shift-f4 */
          case KEY_F( 24):        /* shift-f12 */
-         case KEY_DC:            /* delete key */
          case CTL_DEL:
          case ALT_DEL:
          case KEY_B2:            /* central key on numeric keypad */
          case KEY_ENTER:         /* on numeric keypad */
          case ALT_UP:
          case ALT_LEFT: case ALT_RIGHT:
+         case KEY_SRIGHT: case KEY_SLEFT:
 #ifdef __PDCURSES__
          case PADPLUS: case PADMINUS: case PADSLASH:
-         case ALT_DOWN:          /* PDCurses uses this #define... */
-#else
-         case ALT_DN:            /* ...and ncurses uses this one */
 #endif
+         case ALT_DOWN:
+         case KEY_F(17):    /* shift-f5 */
          default:
             debug_printf( "Key %d hit\n", c);
             show_a_file( "dos_help.txt", 0);
@@ -6207,7 +6850,7 @@ int main( int argc, const char **argv)
    set_environment_ptr( "CONSOLE_OPTS", tbuff);
    store_defaults( ephemeris_output_options, element_format,
          element_precision, max_residual_for_filtering,
-         noise_in_arcseconds);
+         noise_in_sigmas);
    set_environment_ptr( "EPHEM_START", ephemeris_start);
    snprintf_err( tbuff, sizeof( tbuff), "%d", n_ephemeris_steps);
    set_environment_ptr( "EPHEM_STEPS", tbuff);
@@ -6217,6 +6860,7 @@ int main( int argc, const char **argv)
    if( mpc_color_codes)
       free( mpc_color_codes);
    free( command_areas);
+   free( key_remaps);
    clean_up_find_orb_memory( );
    return( 0);
 }
diff --git a/fo.cpp b/fo.cpp
index 3270308c..560fdd23 100644
--- a/fo.cpp
+++ b/fo.cpp
@@ -62,6 +62,7 @@ for Windows and other non-*nix systems. */
 extern int debug_level;
 
 void ensure_config_directory_exists(); /* miscell.c */
+void make_path_available( const char *filename);      /* ephem0.cpp */
 
    /* MSVC/C++ lacks snprintf.  See 'ephem0.cpp' for details. */
 #if defined(_MSC_VER) && _MSC_VER < 1900
@@ -78,17 +79,14 @@ int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
          __attribute__ (( format( printf, 1, 2)))
 #endif
 ;
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
 int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
          int *element_precision, double *max_residual_for_filtering,
-         double *noise_in_arcseconds);                /* elem_out.cpp */
+         double *noise_in_sigmas);                /* elem_out.cpp */
 int inquire( const char *prompt, char *buff, const int max_len,
                      const int color);                /* fo.cpp */
 void refresh_console( void);                          /* fo.cpp */
 void move_add_nstr( const int col, const int row, const char *msg,
                      const int n_bytes);              /* fo.cpp */
-double current_jd( void);                       /* elem_out.cpp */
 char *fgets_trimmed( char *buff, size_t max_bytes, FILE *ifile); /*elem_out.c*/
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
 int make_pseudo_mpec( const char *mpec_filename, const char *obj_name);
@@ -119,13 +117,14 @@ int inquire( const char *prompt, char *buff, const int max_len,
 
 static void object_comment_text( char *buff, const OBJECT_INFO *id)
 {
-   sprintf( buff, "%d observations; ", id->n_obs);
+   snprintf( buff, 25, "%d observations; ", id->n_obs);
    make_date_range_text( buff + strlen( buff), id->jd_start, id->jd_end);
 }
 
 /* In the (interactive) console Find_Orb,  these allow some functions in
-orb_func.cpp to show info as orbits are being computed.  In this
-non-interactive code,  they're mapped to do nothing. */
+orb_func.cpp to show info as orbits are being computed,  or to let you
+abort processing by hitting a key.  In this non-interactive code,
+they're mapped to do nothing. */
 
 void refresh_console( void)
 {
@@ -139,6 +138,11 @@ void move_add_nstr( const int col, const int row, const char *msg, const int n_b
    INTENTIONALLY_UNUSED_PARAMETER( n_bytes);
 }
 
+int curses_kbhit_without_mouse( )
+{
+   return( 0);
+}
+
 static double curr_jd( void)
 {
    const double jd_1970 = 2440587.5;
@@ -158,31 +162,46 @@ static int remove_single_observation_objects( OBJECT_INFO *ids, const int n_ids)
 
 char *make_config_dir_name( char *oname, const char *iname);
 
+#ifdef _WIN32                /* MS is different. */
+   #define UNLINK       _unlink
+#else
+   #define UNLINK       unlink
+#endif
+
 #ifdef FORKING
+void fix_home_dir( char *filename);       /* ephem0.cpp */
+
 static int unlink_config_file( const char *filename)
 {
    char buff[255];
    int err_code;
-   extern int use_config_directory;          /* miscell.c */
+   extern const char *output_directory;
 
    get_file_name( buff, filename);
-   if( use_config_directory)
+   if( output_directory && *output_directory)
       {
       char cpath[255];
 
-      make_config_dir_name( cpath, buff);
-#ifdef _WIN32                /* MS is different. */
-      err_code = _unlink( cpath);
-#else
-      err_code = unlink( cpath);
-#endif
+      strlcpy_error( cpath, output_directory);
+      fix_home_dir( cpath);
+      strlcat_error( cpath, "/");
+      strlcat_error( cpath, buff);
+
+      err_code = UNLINK( cpath);
+      if( err_code)
+         fprintf( stderr, "Failed unlinking '%s' ('%s')\n", filename, buff);
       }
    else
-#ifdef _WIN32
-      err_code = _unlink( buff);
-#else
-      err_code = unlink( buff);
-#endif
+      {
+      char cpath[255];
+
+      make_config_dir_name( cpath, buff);
+      err_code = UNLINK( cpath);
+      if( err_code)
+         fprintf( stderr, "Failed unlinking '%s'\n", cpath);
+      }
+   if( err_code)
+      fprintf( stderr, "Failed unlinking '%s' ('%s')\n", filename, buff);
    return( err_code);
 }
 
@@ -219,7 +238,7 @@ static void _merge_element_files( const char *filename, const int n_processes,
    for( i = 0; i < n_processes; i++)
       {
       process_count = i + 1;
-      input_files[i] = fopen_ext( get_file_name( buff, filename), "tfclr");
+      input_files[i] = fopen_ext( get_file_name( buff, filename), "tfcr");
       }
    for( i = quit = 0; !quit; i++)
       {
@@ -245,7 +264,10 @@ static void _merge_element_files( const char *filename, const int n_processes,
          {
          err_code = unlink_config_file( filename);
          if( err_code)
+            {
+            fprintf( stderr, "Failed to unlink '%s' ('%s')\n", buff, filename);
             perror( buff);
+            }
          assert( !err_code);
          }
       }
@@ -316,9 +338,10 @@ static void get_summary_info( char *buff, const char *mpec_filename)
    FILE *ifile = fopen_ext( mpec_filename, "frb");
    char ibuff[400], *tptr;
    unsigned i;
+   bool is_geocentric = false;
 
-   memset( buff, ' ', 80);
-   buff[80] = '\0';
+   memset( buff, ' ', 81);
+   buff[81] = '\0';
    while( fgets( ibuff, sizeof( ibuff), ifile))
       {
       if( (tptr = strstr( ibuff, "Pseudo-MPEC for")) != NULL)
@@ -335,7 +358,11 @@ static void get_summary_info( char *buff, const char *mpec_filename)
          extract_value( buff + 51, tptr + 5, 1);
       else if( (tptr = strstr( ibuff, " Ea ")) != NULL)
          memcpy( buff + 68, tptr + 4, 7);
+      else if( !memcmp( ibuff, "   Perigee", 10))
+         is_geocentric = true;
       }
+   if( is_geocentric)
+      memcpy( buff + 76, "(geo)", 5);
    fclose( ifile);
 }
 
@@ -414,14 +441,16 @@ static int add_json_data( const char *ofilename, const bool have_json_ephem,
             const char *packed_desig, const bool is_last_call)
 {
    char buff[200];
-   FILE *ofile = fopen_ext( get_file_name( buff, ofilename), "tfcab");
-   FILE *ifile;
+   FILE *ifile, *ofile;
    bool found_start = false, found_end = false;
 
    if( have_json_ephem)
       ifile = open_json_file( buff, "JSON_COMBINED_NAME", "combined.json", packed_desig, "rb");
    else
       ifile = open_json_file( buff, "JSON_ELEMENTS_NAME", "elements.json", packed_desig, "rb");
+   if( !ifile)
+      return( -1);
+   ofile = fopen_ext( get_file_name( buff, ofilename), "tfcab");
    while( !found_start && fgets_trimmed( buff, sizeof( buff), ifile))
       if( !strcmp( buff, "  {"))
          found_start = true;
@@ -462,9 +491,39 @@ static const char *get_arg( const int argc, const char **argv, const int idx)
    return( rval);
 }
 
+static void emit_mpc_standard_epoch_elements( double *orbit, const double curr_epoch,
+                  OBSERVE *obs, const int n_obs, const char *orbit_constraints,
+                  const int element_precision, const int element_options)
+{
+   const char *std_epoch_text = get_environment_ptr( "MPC_EPOCH");
+   extern double _mpc_standard_epoch;
+
+   _mpc_standard_epoch = get_time_from_string( 0., std_epoch_text,
+                          FULL_CTIME_YMD | CALENDAR_JULIAN_GREGORIAN, NULL);
+
+   if( _mpc_standard_epoch)
+      {
+      const int err = full_improvement( obs, n_obs, orbit, curr_epoch, NULL,
+                        ORBIT_SIGMAS_REQUESTED, _mpc_standard_epoch);
+
+      if( !err)
+         {
+         extern const char *elements_filename;
+         const char *saved_elements_filename = elements_filename;
+
+         elements_filename = "mpc_elem.txt";
+         write_out_elements_to_file( orbit, curr_epoch, _mpc_standard_epoch, obs, n_obs,
+                     orbit_constraints, element_precision,
+                     0, element_options);
+         elements_filename = saved_elements_filename;
+         }
+      _mpc_standard_epoch = 0.;
+      }
+}
+
 int main( int argc, const char **argv)
 {
-   char tbuff[300], mpc_codes[200];
+   char tbuff[300], *mpc_codes = (char *)malloc( 20);
    char **summary_lines = NULL;
    const char *separate_residual_file_name = NULL;
    const char *mpec_path = NULL;
@@ -477,9 +536,8 @@ int main( int argc, const char **argv)
    int n_lines_written = 0;
    FILE *summary_ofile = NULL;
    extern int forced_central_body;
-   extern int use_config_directory;          /* miscell.c */
+   int override_forced_central_body = 0;     /* by default,  all orbits are heliocentric */
    int element_precision = 5;
-   bool all_heliocentric = true;
    bool use_colors = true;
    bool show_processing_steps = true;
    ephem_option_t ephemeris_output_options
@@ -495,10 +553,13 @@ int main( int argc, const char **argv)
    int child_status;
 #endif
 
-   if( !strcmp( argv[0], "fo"))
-      use_config_directory = true;
-   else
-      use_config_directory = false;
+   for( i = 1; i < argc; i++)
+      if( argv[i][0] == '-' && argv[i][1] == 'x')
+         {
+         extern const char *alt_config_directory;
+
+         alt_config_directory = get_arg( argc, argv, i);
+         }
    ensure_config_directory_exists();
    *mpc_codes = '\0';
    if( reset_astrometry_filename( &argc, argv))
@@ -529,9 +590,11 @@ int main( int argc, const char **argv)
                }
                break;
             case 'C':
+               mpc_codes = (char *)realloc( mpc_codes,
+                                strlen( mpc_codes) + strlen( arg) + 2);
                if( *mpc_codes)
-                  strlcat_err( mpc_codes, " ", sizeof( mpc_codes));
-               strlcat_err( mpc_codes, arg, sizeof( mpc_codes));
+                  strcat( mpc_codes, " ");
+               strcat( mpc_codes, arg);
                break;
             case 'd':
                debug_level = atoi( arg);
@@ -560,7 +623,10 @@ int main( int argc, const char **argv)
                computed_obs_filename = arg;
                break;
             case 'h':                     /* show planet-centric orbits */
-               all_heliocentric = false;
+               if( !*arg)
+                  override_forced_central_body = ORBIT_CENTER_AUTO;
+               else
+                  override_forced_central_body = atoi( arg);
                break;
 #ifdef FORKING
             case 'k':
@@ -587,6 +653,13 @@ int main( int argc, const char **argv)
             case 'n':
                starting_object = atoi( arg);
                break;
+            case 'N':
+               {
+               extern const char *fullname_pattern;
+
+               fullname_pattern = arg;
+               }
+               break;
             case 'O':          /* write output files to specified dir */
                {
                extern const char *output_directory;
@@ -596,10 +669,16 @@ int main( int argc, const char **argv)
                break;
             case 'o':            /* obj designation / ephemeris from orbital */
                break;            /* elems:  fall through, handle below */
-            case 'p':
+            case 'P':
                {
-               FILE *ifile = fopen_ext( "dummy.txt", "tfcw");
+               extern const char *desig_pattern;
 
+               desig_pattern = arg;
+               }
+               break;
+            case 'p':
+               {
+               ifile = fopen_ext( "dummy.txt", "tfcw");
                fclose( ifile);
                n_processes = atoi( arg);
                }
@@ -698,13 +777,7 @@ int main( int argc, const char **argv)
                   state_vect_text = arg;
                   }
                break;
-            case 'x':
-               {
-               extern const char *alt_config_directory;
-
-               use_config_directory = true;
-               alt_config_directory = arg;
-               }
+            case 'x':            /* handled above */
                break;
             case 'X':
                {
@@ -720,9 +793,6 @@ int main( int argc, const char **argv)
                n_extra_full_steps = atoi( arg);
                }
                break;
-            case 'z':
-               use_config_directory = true;
-               break;
             default:
                printf( "Unknown command-line option '%s'\n", argv[i]);
                return( -1);
@@ -749,7 +819,7 @@ int main( int argc, const char **argv)
          }
       }
 
-   forced_central_body = (all_heliocentric ? 0 : ORBIT_CENTER_AUTO);
+   forced_central_body = override_forced_central_body;
    if( ephem_option_string)
       ephemeris_output_options = parse_bit_string( ephem_option_string);
 
@@ -832,6 +902,7 @@ int main( int argc, const char **argv)
             {
             extern int append_elements_to_element_file;
             extern int n_obs_actually_loaded;
+            extern int available_sigmas;
             extern char orbit_summary_text[];
             long file_offset = ids[i].file_offset - 40000L;
             int element_options = ELEM_OUT_ALTERNATIVE_FORMAT;
@@ -847,7 +918,6 @@ int main( int argc, const char **argv)
 
             if( (n_obs_actually_loaded > 1 || !drop_single_obs) && curr_epoch > 0.)
                {
-               extern int available_sigmas;
                int n_obs_included = 0;
                unsigned j = 0;
 
@@ -948,12 +1018,12 @@ int main( int argc, const char **argv)
                      }
                   while( *mpc_code_tptr)
                      {
-                     char mpc_code[10], ephem_filename[200];
+                     char mpc_code[20], ephem_filename[200];
 
                      j = 0;
-                     while( j < 9 && *mpc_code_tptr > ' ' && *mpc_code_tptr != ',')
+                     while( j < sizeof( mpc_code) && *mpc_code_tptr > ' ' && *mpc_code_tptr != ',')
                         mpc_code[j++] = *mpc_code_tptr++;
-                     assert( j < 9);
+                     assert( j < sizeof( mpc_code));
                      mpc_code[j] = '\0';
                      while( *mpc_code_tptr == ' ' || *mpc_code_tptr == ',')
                         mpc_code_tptr++;
@@ -966,6 +1036,7 @@ int main( int argc, const char **argv)
                         real_packed_desig( packed_desig, obs->packed_id);
                         text_search_and_replace( ephem_filename, "%p", packed_desig);
                         ephemeris_filename = ephem_filename;
+                        make_path_available( ephem_filename);
                         }
                      if( !ephemeris_in_a_file_from_mpc_code( ephemeris_filename,
                               orbits_to_use, obs, n_obs_actually_loaded,
@@ -1002,7 +1073,7 @@ int main( int argc, const char **argv)
                               if( j == 4)
                                  {
                                  tbuff[23] = tbuff[39] = tbuff[73] = '\0';
-                                 snprintf_append( new_line, sizeof( new_line), "  %s  %s  %s",
+                                 snprintf_append( new_line, sizeof( new_line), " %s  %s  %s",
                                           tbuff + 15, tbuff + 30, tbuff + 57);
                                                 /* now add sigma from end of ephem: */
                                  while( fgets_trimmed( tbuff, sizeof( tbuff), ephemeris_ifile))
@@ -1040,6 +1111,9 @@ int main( int argc, const char **argv)
             if( n_processes == 1)
                add_json_data( "total.json", have_json_ephem, obs->packed_id,
                      i == starting_object + total_objects - 1);
+            if( available_sigmas == COVARIANCE_AVAILABLE)
+               emit_mpc_standard_epoch_elements( orbit, curr_epoch, obs, n_obs_actually_loaded,
+                                       orbit_constraints, element_precision, element_options);
             unload_observations( obs, n_obs_actually_loaded);
             }
          object_comment_text( tbuff, ids + i);
@@ -1050,6 +1124,7 @@ int main( int argc, const char **argv)
             printf( "  %s\n", tbuff);
          }
    free( ids);
+   free( mpc_codes);
    if( summary_ofile)
       {
       int pass;
diff --git a/fo_serve.cpp b/fo_serve.cpp
index 9cae5e3a..002b7626 100644
--- a/fo_serve.cpp
+++ b/fo_serve.cpp
@@ -49,11 +49,9 @@ int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
          __attribute__ (( format( printf, 1, 2)))
 #endif
 ;
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
 int get_defaults( ephem_option_t *ephemeris_output_options, int *element_format,
          int *element_precision, double *max_residual_for_filtering,
-         double *noise_in_arcseconds);                /* elem_out.cpp */
+         double *noise_in_sigmas);                /* elem_out.cpp */
 int make_pseudo_mpec( const char *mpec_filename, const char *obj_name);
                                                /* ephem0.cpp */
 int inquire( const char *prompt, char *buff, const int max_len,
@@ -96,8 +94,9 @@ int inquire( const char *prompt, char *buff, const int max_len,
 }
 
 /* In the (interactive) console Find_Orb,  these allow some functions in
-orb_func.cpp to show info as orbits are being computed.  In this
-non-interactive code,  they're mapped to do nothing. */
+orb_func.cpp to show info as orbits are being computed,  or to let you
+abort processing by hitting a key.  In this non-interactive code,
+they're mapped to do nothing. */
 
 void refresh_console( void)
 {
@@ -111,6 +110,11 @@ void move_add_nstr( const int col, const int row, const char *msg, const int n_b
    INTENTIONALLY_UNUSED_PARAMETER( n_bytes);
 }
 
+int curses_kbhit_without_mouse( )
+{
+   return( 0);
+}
+
 static void show_problem_message( void)
 {
    FILE *ifile = fopen( "problem.htm", "rb");
@@ -162,6 +166,7 @@ int main( const int argc, const char **argv)
    const char *file_names[4] = { "mpec.htm", "combined.json", "elements.json", "ephemeri.json" };
    extern bool neocp_redaction_turned_on;
    int center_object = -2;
+   extern const char *alt_config_directory;
 #ifndef _WIN32
    extern char **environ;
    extern bool findorb_already_running;
@@ -170,6 +175,7 @@ int main( const int argc, const char **argv)
 #endif         /* _WIN32 */
    INTENTIONALLY_UNUSED_PARAMETER( argv);
    INTENTIONALLY_UNUSED_PARAMETER( argc);
+   alt_config_directory = "./";        /* program runs in config directory */
    setvbuf( lock_file, NULL, _IONBF, 0);
    neocp_redaction_turned_on = false;
    fprintf( lock_file, "We're in\n");
@@ -491,6 +497,7 @@ int main( const int argc, const char **argv)
       }
    while( fgets( buff, max_buff_size, ifile))
       printf( "%s", buff);
+   fflush( stdout);
    fclose( ifile);
    if( (i = strlen( mpec_name)) > 8)
       {
diff --git a/geo_max.cpp b/geo_max.cpp
new file mode 100644
index 00000000..21b5593e
--- /dev/null
+++ b/geo_max.cpp
@@ -0,0 +1,137 @@
+/* Compiles with
+
+g++ -Wall -Wextra -pedantic -DFIND_MAX -o geo_max geo_max.cpp geo_pot.cpp
+
+We pick points randomly over the unit sphere (or scaled sphere,  if
+its radius is set on the command line) and compute the magnitude
+of the acceleration provided by the terms in each degree l=1...N_TERMS-1.
+This allows us to ignore small terms;  if we know,  for example,
+that the l=5 term contributes a maximum acceleration of 1.793e-4 m/s^2
+on the earth's surface (see table below),  and we know that that acceleration
+will decrease by r^(l+1) = r^6 with distance,  we can very quickly
+determine the maximum acceleration due to the l=5 terms and (if that
+value is less than a tolerance value) not bother computing those terms.
+
+At least in theory,  we really only need run this once and save the
+results... except we may want to do the same thing for planets/satellites
+other than the earth.  (Changes in Earth gravity models will happen,  but
+will probably not affect the following very significantly.)
+
+The bit about resetting the radius value is basically a sanity check to
+make sure that if,  for example,  we go to two Earth radii,  then the l=2
+term drops eightfold,  the l=3 terms drops 16-fold,  and so on.  */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#define N_TERMS 50
+#define PI 3.1415926535897932384626433832795028841971693993751058209749445923
+#define is_power_of_two( X)   (!((X) & ((X) - 1)))
+#define EARTH_MAJOR_AXIS 6378140.
+#define AU_IN_KM 1.495978707e+8
+#define AU_IN_METERS (AU_IN_KM * 1000.)
+#define EARTH_R (EARTH_MAJOR_AXIS / AU_IN_METERS)
+
+const double seconds_per_day = 24. * 60. * 60.;
+
+double geo_potential_in_au( const double x, const double y, const double z,
+                 double *derivs, const int n_terms);    /* geo_pot.c */
+
+int main( const int argc, const char **argv)
+{
+   int l, iter, max_iter = (argc > 2 ? atoi( argv[2]) : INT_MAX);
+   double maxima[N_TERMS + 1], r = EARTH_R;
+
+   for( l = 0; l <= N_TERMS; l++)
+      maxima[l] = 0.;
+   if( argc > 1)
+      r *= atof( argv[1]);
+   for( iter = 0; iter < max_iter; iter++)
+      {
+      const double golden_ratio = 0.618033988749894848204586834365638117720309179805762862135448;
+      const double theta = (double)iter * golden_ratio * 2. * PI;
+      const double phi = (double)rand( ) * PI / (double)RAND_MAX - PI / 2.;
+      const double x = cos( theta) * cos( phi) * r;
+      const double y = sin( theta) * cos( phi) * r;
+      const double z =               sin( phi) * r;
+      double derivs[3];
+
+      for( l = 0; l < N_TERMS; l++)
+         {
+         double magn;
+         extern int _starting_term;    /* see geo_pot.cpp */
+
+         _starting_term = l;
+         geo_potential_in_au( x, y, z, derivs, l + 1);
+         magn = sqrt( derivs[0] * derivs[0] + derivs[1] * derivs[1]
+                                            + derivs[2] * derivs[2]);
+         magn *= AU_IN_METERS / (seconds_per_day * seconds_per_day);
+         if( maxima[l] < magn)
+            maxima[l] = magn;
+         if( iter > 8 && is_power_of_two( iter))
+            {
+            if( !l)
+               printf( "%d iterations\n", iter);
+            printf( "%d %e\n", l, maxima[l]);
+            }
+         }
+      }
+   return( 0);
+}
+
+/*    Example output after letting the above run a few hours,  slightly annotated :
+67108864 iterations
+0 0.000000e+00
+1 0.000000e+00
+2 3.182389e-02   max accel in m/s^2 at one Earth radius from this degree
+3 2.565965e-04
+4 1.793323e-04
+5 1.735515e-04
+6 1.728922e-04
+7 1.640899e-04
+8 1.204194e-04
+9 1.270214e-04
+10 1.180861e-04
+11 1.066728e-04
+12 6.365494e-05
+13 9.537023e-05
+14 6.969121e-05
+15 6.828519e-05
+16 7.836637e-05
+17 7.223730e-05
+18 8.435522e-05
+19 7.640814e-05
+20 7.170008e-05
+21 7.496947e-05
+22 7.833297e-05
+23 6.913263e-05
+24 6.512307e-05
+25 7.156668e-05
+26 6.328121e-05
+27 4.923338e-05
+28 6.474922e-05
+29 7.520465e-05
+30 6.661961e-05
+31 7.355495e-05
+32 7.175292e-05
+33 7.857323e-05
+34 8.297337e-05
+35 8.565782e-05
+36 7.856592e-05
+37 7.883188e-05
+38 6.901209e-05
+39 9.012344e-05
+40 7.331633e-05
+41 6.597861e-05
+42 8.001026e-05
+43 8.139275e-05
+44 7.368858e-05
+45 7.691823e-05
+46 8.372209e-05
+47 8.640496e-05
+48 8.220453e-05
+49 7.372291e-05
+50 7.849325e-05 */
+
diff --git a/geo_pot.cpp b/geo_pot.cpp
index f178809a..1a13e1ef 100644
--- a/geo_pot.cpp
+++ b/geo_pot.cpp
@@ -16,7 +16,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <stdbool.h>
 #include <assert.h>
 #include <math.h>
@@ -28,22 +27,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    #define isnan _isnan
 #endif
 
-long double geo_potential( const long double x, const long double y,
-                                  const long double z, long double *derivs,
-                                  int n_terms);   /* geo_pot.c */
 double geo_potential_in_au( const double x, const double y, const double z,
                  double *derivs, const int n_terms);    /* geo_pot.c */
 
 #define PI 3.1415926535897932384626433832795028841971693993751058209749445923
 
 #ifdef __WATCOMC__
-   /* OpenWATCOM apparently lacks sqrtl()... : */
-static long double sqrtl( const long double ival)
-{
-   assert( ival > 0.);
-   return( (long double)sqrt( (double)ival));
-}
-   /* ...and we have a smaller stack to work with : */
+#define sqrtl sqrt
 #define N_TERMS 10
 #else
    /* Everyplace else,  we can go with a lot of spherical harmonic
@@ -64,9 +54,8 @@ convenient C array below.  Note that data in the same format is available
 for the Moon,  Mars,  and Venus;  it should be quite easy to add them to
 Find_Orb in the same way,  if we ever decide that would matter.   */
 
-   static long double ggm03c_terms[] = {
-//      1.000000000000E+00,  0.000000000000E+00,   /* 0 0 */
-        0.000000000000E+00,  0.000000000000E+00,   /* 0 0 */
+   static long double ggm03c_terms[] = {           /* l m   (l=degree,  m=order) */
+        1.000000000000E+00,  0.000000000000E+00,   /* 0 0 */
 
         0.000000000000E+00,  0.000000000000E+00,   /* 1 0 */
         0.000000000000E+00,  0.000000000000E+00,   /* 1 1 */
@@ -1526,13 +1515,7 @@ static void renormalize_terms( void)
    int l, m;
    long double *geo_tptr = ggm03c_terms;
 
-                        /* Find_Orb already handles J2 and "J0": */
-#ifndef TEST_MAIN
-//   ggm03c_terms[0] = ggm03c_terms[6] = 0.;
-#else
-// ggm03c_terms[0] =                   0.;
-#endif
-   for( l = 0; l < N_TERMS - 1; l++)       /* skip l=0 & l=1 */
+   for( l = 0; l <= N_TERMS; l++)
       {
       long double factor = sqrtl( (long double)( l + l + 1));
       const long double sqrt_2 =
@@ -1586,12 +1569,18 @@ P  (x) = 0
   l
 */
 
+/* For the 'geo_max' program,  we may be interested in the sum of only
+some higher-degree terms.  The 'test' program includes term 0 (the 1/r
+potential one).  In those cases,  we reset _starting_term. */
+
+int _starting_term = 1;
+
 /* For geo_potential,  xyz are in units of the earth's radius.  The
 return value is 1 at the earth's radius.  Both facts are a bit of
 a pain,  which is why geo_potential_in_au() gives values in AUs and
-days.  See the 'test_main' code for conversions to MKS. */
+days.  See the 'geo_test.cpp' code for conversions to MKS. */
 
-long double geo_potential( const long double x, const long double y,
+static long double geo_potential( const long double x, const long double y,
                            const long double z, long double *derivs,
                            int n_terms)
 {
@@ -1609,8 +1598,8 @@ long double geo_potential( const long double x, const long double y,
    static bool renormalized = false;
 
    assert( n_terms < 800);       /* see above comments on limits */
-   if( n_terms > N_TERMS - 1)
-      n_terms = N_TERMS - 1;
+   if( n_terms > N_TERMS)
+      n_terms = N_TERMS;
    if( renormalized == false)
       {
       renormalize_terms( );
@@ -1621,13 +1610,13 @@ long double geo_potential( const long double x, const long double y,
    cos_mtheta[0] = 1.;
    sin_mtheta[1] = y / r_cyl;
    cos_mtheta[1] = x / r_cyl;
-   for( m = 1; m < n_terms; m++)
+   for( m = 1; m < n_terms - 1; m++)
       {
       sin_mtheta[m + 1] = sin_mtheta[m] * cos_mtheta[1] + cos_mtheta[m] * sin_mtheta[1];
       cos_mtheta[m + 1] = cos_mtheta[m] * cos_mtheta[1] - sin_mtheta[m] * sin_mtheta[1];
       }
    p[0][0] = 1.;
-   for( m = 0; m < n_terms; m++)
+   for( m = 0; m < n_terms - 1; m++)
       {
       const long double tval = (long double)( 2 * m + 1) * p[m][m];
 
@@ -1650,6 +1639,8 @@ long double geo_potential( const long double x, const long double y,
 //    printf( "r = %.5Le; rpow = %.5Le\n", r, rpow);
       if( l == 1)       /* terms are all zero;  skip 'em */
          geo_tptr += 4;
+      else if( l < _starting_term)
+         geo_tptr += (l + 1) * 2;
       else for( m = 0; m <= l; m++, geo_tptr += 2)
          {
          const long double dp_dphi =
@@ -1674,10 +1665,13 @@ long double geo_potential( const long double x, const long double y,
                      printf( "%d: %Le\n", l, diff);
                      }
 #endif
-      rval += contrib_this_l * rpow;
-      drval_dtheta -= contrib_drval_dtheta * rpow;
-      drval_dphi += contrib_drval_dphi * rpow;
-      drval_dr += (long double)( l + 1) * contrib_this_l * rpow / r;
+      if( l >= _starting_term)
+         {
+         rval += contrib_this_l * rpow;
+         drval_dtheta -= contrib_drval_dtheta * rpow;
+         drval_dphi += contrib_drval_dphi * rpow;
+         drval_dr += (long double)( l + 1) * contrib_this_l * rpow / r;
+         }
       }
    *derivs++ = drval_dr;
    *derivs++ = drval_dtheta;
@@ -1738,135 +1732,3 @@ double geo_potential_in_au( const double x, const double y, const double z,
       }
    return( rval);
 }
-
-#ifdef TEST_MAIN
-
-static double jn_potential( const double x, const double y, const double z,
-                         const double j2,  const double j3, const double j4)
-{
-   const double r2 = x * x + y * y + z * z;
-   const double r = sqrt( r2);
-   const double mu = z / r;
-   const double mu2 = mu * mu;
-   const double p3 = mu * (2.5 * mu2 - 1.5);
-   const double p4 = (35. * mu2 * mu2 - 30. * mu2 + 3.) / 8.;
-   const double p2 = 1.5 * mu2 - .5;     /* Danby, p. 115 */
-
-   return( (j2 * p2 + j3 * p3 / r + j4 * p4 / r2) / (r * r2));
-// return( (          j3 * p3 / r + j4 * p4 / r2) / (r * r2));
-}
-
-#include <stdio.h>
-
-#define EARTH_R2 (EARTH_R * EARTH_R)
-#define EARTH_R3 (EARTH_R * EARTH_R2)
-#define J2_IN_EARTH_UNITS (1.0826355254e-3)
-#define J3_IN_EARTH_UNITS (-2.5325505977e-6)
-#define J4_IN_EARTH_UNITS (-1.62870177e-6)
-#define EARTH_J2 (J2_IN_EARTH_UNITS * EARTH_R2)
-#define EARTH_J3 (J3_IN_EARTH_UNITS * EARTH_R3)
-#define EARTH_J4 (J4_IN_EARTH_UNITS * EARTH_R3 * EARTH_R)
-
-#include <stdlib.h>
-
-int main( const int argc, const char **argv)
-{
-   const double lat = atof( argv[1]) * PI / 180.;
-   const double lon = atof( argv[2]) * PI / 180.;
-   int n_terms = N_TERMS - 1;
-#ifdef GEOID_HEIGHT
-   double oval;
-   long double loc[3], derivs[3];
-
-   const double earth_gm = 0.3986004415E+15;   /* GGM03 value, in m^3/s^2 */
-   const double omega = 7292115e-11;           /* in radians/second */
-   const double earth_minor_axis = 6356755.;    /* polar radius */
-   const double centrifugal_pot_at_equator =
-         EARTH_MAJOR_AXIS * EARTH_MAJOR_AXIS * EARTH_MAJOR_AXIS * omega * omega / earth_gm;
-
-   if( argc > 3)
-      n_terms = atoi( argv[3]);
-   loc[0] = (long double)( cos( lon) * cos( lat));
-   loc[1] = (long double)( sin( lon) * cos( lat));
-   loc[2] = (long double)( sin( lat) * earth_minor_axis / EARTH_MAJOR_AXIS);
-   ggm03c_terms[0] = 1.;      /* include "J0" term    */
-   oval = 1. - (double)geo_potential( loc[0], loc[1], loc[2], derivs, n_terms);
-   oval -= centrifugal_pot_at_equator * cos( lat) * cos( lat) / 2.;
-   printf( "%e  (geoid height %f meters)\n", oval,
-                 -14497.68 - oval * EARTH_MAJOR_AXIS);
-#else
-                     /* cvt radius from units of earth radii to AU: */
-   const double r = atof( argv[3]) * EARTH_MAJOR_AXIS / AU_IN_METERS;
-   const double delta = r * .0001;
-   const double x = r * cos( lon) * cos( lat);
-   const double y = r * sin( lon) * cos( lat);
-   const double z = r *             sin( lat);
-   double derivs[3], dpot;
-
-   if( argc > 4)
-      n_terms = atoi( argv[4]);
-   printf( "  %e\n", jn_potential( x * AU_IN_METERS / EARTH_MAJOR_AXIS,
-                                   y * AU_IN_METERS / EARTH_MAJOR_AXIS,
-                                   z * AU_IN_METERS / EARTH_MAJOR_AXIS,
-                                   EARTH_J2, EARTH_J3, EARTH_J4));
-   printf( "  %e\n",
-              geo_potential_in_au( x, y, z, derivs, n_terms));
-   printf( "  Derivs: %.10e %.10e %.10e (analytical)\n", derivs[0], derivs[1], derivs[2]);
-   for( size_t i = 0; i < 3; i++)
-      derivs[i] *= AU_IN_METERS / (seconds_per_day * seconds_per_day);
-   printf( "  Derivs: %.10e %.10e %.10e (analytical, m/s^2)\n", derivs[0], derivs[1], derivs[2]);
-
-   dpot = geo_potential_in_au( x + delta, y, z, NULL, n_terms)
-        - geo_potential_in_au( x - delta, y, z, NULL, n_terms);
-   derivs[0] = .5 * dpot / delta;
-   dpot = geo_potential_in_au( x, y + delta, z, NULL, n_terms)
-        - geo_potential_in_au( x, y - delta, z, NULL, n_terms);
-   derivs[1] = .5 * dpot / delta;
-   dpot = geo_potential_in_au( x, y, z + delta, NULL, n_terms)
-        - geo_potential_in_au( x, y, z - delta, NULL, n_terms);
-   derivs[2] = .5 * dpot / delta;
-   printf( "  Derivs: %.10e %.10e %.10e (numerical, AU/day^2)\n", derivs[0], derivs[1], derivs[2]);
-#endif
-   printf( "Lat %c%f Long %c%f\n",
-         (lat > 0. ? 'N' : 'S'), fabs( lat) * 180. / PI,
-         (lon > 0. ? 'E' : 'W'), fabs( lon) * 180. / PI);
-   return( 0);
-}
-#endif          // #ifdef TEST_MAIN
-
-/*
-   Comparisons made to
-
-http://geographiclib.sourceforge.net/cgi-bin/GeoidEval?input=44+-69.9&option=Submit
-
-0 0:       17.226  16.927145
-45 0:      46.767  47.289086
-90 0:      14.898  14.898461
-0 120:     59.82   58.211502
-0 100:     -6.92   -6.904056
-0 80:    -102.59 -102.701770
-0 60:     -62.59  -62.740079
-10 125:    63.91   64.616471
-44 -69.9: -26.70  -26.649304
--10 -125: -10.25  -10.678747
-lat lon
-         online   geo_pot.c
-
-   Note that rearrangement of the order of computation has changed the results
-by a millimeter or so...
-
-phred@phred:~/find_orb$ ./geo_pot 0 0 1 19
-  -2.085725e-05
-  Derivs: 4.8973461530e-01 2.3583555353e-06 -5.7623158275e-06 (analytical)
-  Derivs: 9.8142864339e+00 4.7261467768e-05 -1.1547686499e-04 (analytical, m/s^2)
-  Derivs: 4.8973462022e-01 2.3583549381e-06 -5.7623145439e-06 (numerical, AU/day^2)
-phred@phred:~/find_orb$ ./geo_pot 31.4 159 1 19
-  -2.084797e-05
-  Derivs: -3.8937807981e-01 1.4946019510e-01 2.5541973048e-01 (analytical)
-  Derivs: -7.8031404906e+00 2.9951837573e+00 5.1186138726e+00 (analytical, m/s^2)
-  Derivs: -3.8937808013e-01 1.4946019321e-01 2.5541972839e-01 (numerical, AU/day^2)
-phred@phred:~/find_orb$ ./geo_pot 31.4 159 .8 19
-  -2.606101e-05
-  Derivs: -6.0807926146e-01 2.3343379352e-01 3.9961972747e-01 (analytical)
-  Derivs: -1.2185914289e+01 4.6780154831e+00 8.0083832089e+00 (analytical, m/s^2)
-  Derivs: -6.0807926193e-01 2.3343379057e-01 3.9961972424e-01 (numerical, AU/day^2) */
diff --git a/geo_rect.txt b/geo_rect.txt
index 55118043..a854c98f 100644
--- a/geo_rect.txt
+++ b/geo_rect.txt
@@ -3,8 +3,8 @@
 # if an MPC code is within that rectangle,  we can ID it.
 # Every now and then,  an MPC code is added for which no
 # rectangle exists;  I then have to add a rectangle or two.
-# 2021 May 6 version.
-   6.61665  32.28687   2.38989  37.29359  Algeria
+# 2024 Jun 07 version.
+   7.4      23.0      -0.9      37.29359  Algeria
  303.64175 -38.50229 302.15234 -35.24411  Argentina
  300.93768 -34.54863 301.45872 -34.35379  Argentina
  301.02672 -38.17328 290.50902 -32.37026  Argentina
@@ -13,12 +13,16 @@
  301.53716 -32.76203 289.89217 -30.46666  Argentina
  300.86715 -37.92774 301.67172 -34.51240  Argentina
   44.38080  40.25636  44.17335  40.43883  Armenia
- 141.01    -30.01    150.00    -33.99     Australia/NSW
- 148.52754 -30.66768 151.34384 -35.50398  Australia/NSW
+ 141.01    -29.01    150.00    -33.99     Australia/NSW
+ 148.52754 -30.66768 151.34384 -35.116    Australia/NSW
+ 148.25    -36.8     150.5     -35.93     Australia/NSW
  151.01217 -33.80402 153.68080 -29.2      Australia/NSW
+ 149.177   -35.16    149.061   -35.37     Australia/ACT
+ 149.127   -35.57    148.82    -35.31     Australia/ACT
+ 148.945   -35.235   149.064   -35.32     Australia/ACT
  129.05    -25.9     137.95    -11.       Australia/NT
  138.05    -25.9     145.0     -10.0      Australia/QLD
- 141.01    -29.99    149.9     -12.       Australia/QLD
+ 141.01    -28.99    149.9     -12.       Australia/QLD
  149.8     -28.13    155.0     -18.0      Australia/QLD
  140.95    -36.36183 129.05    -26.01     Australia/SA
  148.97923 -43.76038 143.24429 -39.31771  Australia/Tas
@@ -42,15 +46,17 @@
   30.15230  54.46161  30.24712  54.52937  Belarus
   30.35523  55.04222  30.28705  55.08988  Belarus
   30.27812  54.45837  30.34033  54.49805  Belarus
-   5.00553  49.85874   5.79216  50.71319  Belgium
-   4.18511  50.66358   5.12566  51.27599  Belgium
+   4.9      49.81      5.71     50.75     Belgium
+   4.18511  50.3       5.12566  51.27599  Belgium
    5.03911  50.69128   5.52083  51.25122  Belgium
    4.22644  51.19      3.3      50.54     Belgium
- 294.57113 -16.66101 297.32325 -21.86877  Bolivia
- 330.28916   0.03543 306.83735 -29.53313  Brazil
-  25.91725  43.19499  24.57098  41.61325  Bulgaria
-  24.61143  42.22372  23.15293  41.60719  Bulgaria
-  24.74661  42.19076  22.90864  42.96089  Bulgaria
+ 294.4     -13.1     297.32325 -21.86877  Bolivia
+ 291.9     -10.75    294.56    -21.7      Bolivia
+ 330.28916   2.1     306.36    -32.1      Brazil
+  23.72     43.78257  22.57923  43.49     Bulgaria
+  23.03     42.13     28.7      43.6      Bulgaria
+  23.1      41.6      26.0      42.2      Bulgaria
+  22.84     42.08     23.2      42.96089  Bulgaria
  249.86930  59.89073 245.42444  49.75608  Canada/Alberta
  236.05     48.95000 236.73242  48.30226  Canada/BritColumbia
  298.30604  43.60429 295.96096  44.91909  Canada/Nova Scotia
@@ -91,11 +97,12 @@
  279.33622  -2.99496 282.40127   0.51311  Ecuador
   29.97687  28.99062  32.08110  30.46994  Egypt
   26.09511  58.15057  27.17496  58.57450  Estonia
-  21.23840  61.25700  25.27909  59.96295  Finland
+  20.9      63.4      25.2      59.72     Finland
   26.28669  62.37893  30.37196  63.17464  Finland
-  28.10833  63.40558  24.37278  65.13680  Finland
-  22.18440  63.74796  27.25431  60.32244  Finland
+  29.3      63.0      22.4      65.13680  Finland
+  21.2      63.74796  27.53     60.21     Finland
   27.00762  62.46570  29.20649  61.34238  Finland
+  27.15704  61.37688  28.54178  60.98231  Finland
   56.49389 -22.56023  54.39112 -19.98478  France (Reunion)
    6.47313  43.07395   7.47170  44.08644  France
  359.42644  45.55514 354.42487  49.06454  France
@@ -125,7 +132,7 @@
    9.15661  50.42325   6.73535  49.23     Germany
   13.48518  50.89690  13.96587  51.25538  Germany
   12.67531  51.19280  14.43134  52.49042  Germany
-  10.96989  48.04770  10.02392  47.63486  Germany
+  10.96989  48.04770   9.4      47.63486  Germany
   10.19652  50.29814   6.32771  51.73617  Germany
    9.42431  54.52353   9.67069  54.82626  Germany
   13.88152  52.14215   7.38403  54.50790  Germany
@@ -159,7 +166,7 @@
    7.81254  44.70741   7.04130  45.20363  Italy
   13.85618  45.63548  13.88033  45.64737  Italy
   10.33888  45.77192   9.13544  46.13470  Italy
-  13.42322  46.09051  13.55026  46.21083  Italy
+  13.42322  46.09051  13.554    46.205    Italy
    9.14671  46.04991   9.03194  45.98286  Italy
    7.82084  45.76976   8.85791  45.93909  Italy
   10.41452  45.78326   7.77584  43.70087  Italy
@@ -200,9 +207,9 @@
   15.30026 -18.17073  19.80994 -27.80360  Namibia
    4.64944  53.29173   6.98727  52.70932  Netherlands
    4.36278  52.18116   4.93898  52.38185  Netherlands
-   4.79648  52.88124   6.55358  51.92444  Netherlands
+   4.0      52.88124   6.55358  51.92444  Netherlands
    5.25194  51.37910   5.91140  51.94351  Netherlands
-   5.32070  52.19322   4.38880  51.55362  Netherlands
+   5.32070  52.19322   4.2      51.55362  Netherlands
    3.31142  52.22369   4.30885  51.42195  Netherlands
  179.99964 -33.0     163.37326 -52.0      New Zealand
    4.0      59.42062  11.5      66.0      Norway
@@ -218,17 +225,16 @@
   27.07851  45.04467  28.12082  45.46308  Romania
   23.05     46.20137  28.0      44.15     Romania
  100.92996  51.62484 100.91512  51.61492  Russia
- 147.87097  73.06036  85.78350  54.39476  Russia
- 135.59385  42.34297 131.39585  44.70389  Russia
+ 147.87097  82.0      85.78350  54.39476  Russia
+ 137.0      42.34297 131.39585  44.70389  Russia
   20.54298  54.68216  20.44457  54.74098  Russia
-  51.76038  55.31230  40.81277  58.97559  Russia
   56.24474  57.66734  43.99374  51.16343  Russia
   32.53500  58.68073  30.15329  60.02166  Russia
-  39.80419  54.64454  35.72156  56.08148  Russia
+  34.47     51.81     59.9      80.0      Russia
   42.63997  43.64096  42.40687  43.82810  Russia
   80.12065  67.09643  87.30336  55.65619  Russia
   41.47221  43.59200  41.27990  43.76269  Russia
- 128.30607  50.70356 127.43486  50.28087  Russia
+ 172.0      78.0     127.43486  50.28087  Russia
  119.4      57.0     102.4      50.73     Russia
   34.20227  55.44211  61.57681  57.57751  Russia
   42.76794  43.66783  42.53104  43.83595  Russia
@@ -242,8 +248,8 @@
  130.0      35.23450 127.07631  38.24005  South Korea
   17.08892  48.20689  18.50908  48.70852  Slovakia
   18.63849  48.21585  17.64866  47.81890  Slovakia
-  20.66723  49.01991  20.13318  49.25464  Slovakia
-  13.98334  45.91241  14.64436  46.28308  Slovenia
+  21.98     48.58     20.13318  49.25464  Slovakia
+  13.7      45.8      14.64436  46.37     Slovenia
   25.67944 -29.45349  26.82695 -28.59323  South Africa
   33.33702 -34.91447  16.00973 -29.54048  South Africa
   29.48779 -27.76375  26.28938 -25.04480  South Africa
@@ -279,8 +285,10 @@
  122.49201  25.30605 119.52135  22.23798  Taiwan
  120.96746  21.69588 120.45697  22.29089  Taiwan
   69.32095  38.24574  68.52171  38.63428  Tajikistan
-  33.68903  35.22869  33.79786  35.31185  Cyprus
-  35.62401  36.23383  27.01750  41.61430  Turkey
+  32.0      34.5      34.8      35.75     Cyprus
+  41.35     37.87     26.7      41.61430  Turkey
+  27.1      38.0      40.3      37.0      Turkey
+  28.4      37.1      35.6      35.77     Turkey
   23.02990  48.45982  22.28328  48.65960  Ukraine
   36.92971  47.90002  39.07874  49.46208  Ukraine
   34.47825  44.15279  32.66402  45.29246  Ukraine
@@ -328,9 +336,9 @@
  264.71141  37.02656 265.34441  39.13161  US/Kansas
  275.35419  38.80459 275.53264  39.05982  US/Kentucky
  266.77794  28.37703 269.79065  30.93144  US/Louisiana
- 286.74501  42.08170 287.90030  42.68512  US/Massachusetts
- 290.01801  42.07212 288.79462  41.71572  US/Massachusetts
- 289.41961  42.07267 287.86394  42.69641  US/Massachusetts
+ 286.74501  42.05    287.90030  42.71     US/Massachusetts
+ 290.2      42.1     288.78     41.7      US/Massachusetts
+ 289.41961  42.04    287.86394  42.69     US/Massachusetts
  290.16019  41.19328 288.96360  41.73186  US/Massachusetts
  288.97082  41.72306 288.88003  41.51031  US/Massachusetts
  279.2      39.7     280.21083  38.41186  US/West Virginia
@@ -347,12 +355,12 @@
  268.33553  36.55900 269.54974  38.86144  US/Missouri
  268.48172  40.37630 265.41096  36.56147  US/Missouri
  269.52981  38.51000 269.71555  38.91137  US/Missouri
- 271.27766  31.15366 269.08369  32.30217  US/Mississippi
+ 271.49     31.02    269.12     34.01     US/Mississippi
  279.36988  35.91417 277.11     35.23     US/North Carolina
  283.87672  36.44960 279.19530  35.05624  US/North Carolina
  256.01000  46.01000 262.94274  47.94690  US/North Dakota
  263.21675  42.64064 258.01327  40.07413  US/Nebraska
- 288.86824  42.90658 287.71823  43.72684  US/New Hampshire
+ 289.01     42.88    287.71823  43.72684  US/New Hampshire
  287.55183  42.95032 288.67638  42.72690  US/New Hampshire
  286.03993  40.05112 285.26323  40.40047  US/New Jersey
  286.02081  39.51938 285.09411  40.08385  US/New Jersey
@@ -362,10 +370,10 @@
  251.04479  36.90350 256.83688  32.10319  US/New Mexico
  251.31717  31.77652 250.96447  31.88656  US/New Mexico
  245.79594  39.10819 240.13574  41.88559  US/Nevada
- 285.28487  43.48866 281.15970  42.01000  US/New York
+ 285.3      43.48866 281.15970  42.01     US/New York
  288.02765  40.59884 286.40026  40.98034  US/New York
- 284.68342  43.40701 283.83141  44.21315  US/New York
- 285.28469  44.89083 286.32985  41.56256  US/New York
+ 284.8      43.40701 283.83141  44.21315  US/New York
+ 285.28469  44.98    286.453    41.42     US/New York
  286.65227  40.45582 285.99421  40.75287  US/New York
  285.40609  43.38339 284.76268  44.82673  US/New York
  286.0      40.52323 285.81321  40.644    US/New York
@@ -381,7 +389,7 @@
  282.36194  41.40296 284.73003  39.92457  US/Pennsylvania
  284.05076  41.35314 284.62669  41.89344  US/Pennsylvania
  294.41706  17.79858 292.66117  18.71838  US/Puerto Rico
- 288.57593  41.28832 288.21614  42.00158  US/Rhode Island
+ 288.57593  41.1     288.21614  42.00158  US/Rhode Island
  288.69987  41.76081 288.70101  41.76237  US/Rhode Island
  278.45121  33.18432 280.21837  34.75049  US/South Carolina
  256.02582  43.03508 262.94006  45.87507  US/South Dakota
@@ -406,7 +414,7 @@
   69.38634  41.25923  69.23515  41.37295  Uzbekistan
   67.03072  38.60081  66.69847  39.28591  Uzbekistan
  298.51379  10.89575 288.12733   7.46167  Venezuela
-   5.51071  51.07930   5.70547  50.91883  Belgium
+   5.51071  51.18      5.70547  50.91883  Belgium
    6.34297  51.00898   6.17260  51.27992  Germany
   26.63057  45.41100  27.96808  46.72719  Romania
  285.08416  40.48342 284.94812  41.01119  US/New Jersey
@@ -461,8 +469,8 @@
   74.46     31        69.48     32.7      Pakistan
    6.03126  50.72360   6.03187  50.72442  Belgium
  278.85     33.91    277.58011  35.15091  US/South Carolina
-  25.6      36.24444  20.51789  40.00086  Greece
-  27.3      34.56925  21.95182  36.32124  Greece
+  25.85     36.24444  20.51789  40.00086  Greece
+  28.3      34.56925  22.0      36.51     Greece
    3.35     51.38495   2.63     50.85931  Belgium
    2.66066  51.15361   2.57584  51.02061  Belgium
   29.27     47.39     28.29     46.59     Moldova
@@ -529,3 +537,35 @@
  300.0      51.45    291.41156  48.11981  Canada/Quebec
   28.4      48.85     22.39238  48.26825  Ukraine
   83.1      40.25     75.5      36.82783  China
+  48.91598  28.00444  38.53502  19.0      Saudi Arabia
+  13.77782  45.59625  13.82731  45.70754  Italy
+  25.20360  39.99416  21.48397  40.83096  Greece
+  22.93616  40.77475  25.97215  41.18959  Greece
+  99.7      17.4     102.3      11.0      Thailand
+ 104.7      14.5     102.2      17.4      Thailand
+  21.52347  47.74     22.29     48.33     Hungary
+  26.78834  40.70184  25.99059  39.40955  Turkey
+  25.76170  36.42509  26.97373  37.83     Greece
+  18.90274  48.29     20.29     49.16     Slovakia
+   4.19987  51.18504   3.99925  51.23037  Belgium
+ 120.02     49.24008 129.58     42.58966  China
+ 287.1      40.57199 288.2      41.2      US/New York
+  85.78     46.5      89.65     47.88     China
+ 286.10805  40.8     286.27070  41.6      US/New York
+  34.78017  30.46537  35.07513  29.98206  Israel
+ 145.7     -33.9     148.75    -35.90665  Australia/NSW
+  74.45     21.0      80.0      30.7      India
+   7.12653  47.09517   6.91492  47.20356  Switzerland
+   4.21626  50.56119   3.68     50.36     Belgium
+  27.93     43.5      26.11     43.94     Bulgaria
+ 276.5      36.7     274.42548  38.41321  US/Kentucky
+ 257.0      31.63423 265.2      33.61180  US/Texas
+ 294.02282  48.27090 295.3      47.97799  Canada/Quebec
+  51.16591 -19.37359  47.37841 -11.78630  Madagascar
+  42.65691 -26.23648  50.0     -14.21298  Madagascar
+ 261.1      36.51    257.01     36.99     US/Oklahoma
+  72.4      -1.0      73.8       7.5      Maldives
+ 289.8     -27.7     290.85    -24.0      Chile
+  12.99864  48.18710  12.90683  47.96735  Austria
+  12.6      48.35     12.83715  48.17175  Germany
+ 240.38009  37.68473 241.11908  38.13389  US/California
diff --git a/geo_test.cpp b/geo_test.cpp
new file mode 100644
index 00000000..0c30b4b3
--- /dev/null
+++ b/geo_test.cpp
@@ -0,0 +1,159 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <math.h>
+#include "watdefs.h"
+#include "afuncs.h"
+
+double geo_potential_in_au( const double x, const double y, const double z,
+                 double *derivs, const int n_terms);    /* geo_pot.c */
+extern int _starting_term;
+
+#define PI 3.1415926535897932384626433832795028841971693993751058209749445923
+/* Compile with
+gcc -Wall -Wextra -DTEST_MAIN -o geo_test geo_test.cpp geo_pot.o -lm
+for test code to show potential and its derivatives (i.e.,  acceleration)
+for a given lat/lon/radius from the geocenter,  and the geoid height. */
+
+static double jn_potential( const double x, const double y, const double z,
+                         const double j2,  const double j3, const double j4)
+{
+   const double r2 = x * x + y * y + z * z;
+   const double r = sqrt( r2);
+   const double mu = z / r;
+   const double mu2 = mu * mu;
+   const double p3 = mu * (2.5 * mu2 - 1.5);
+   const double p4 = (35. * mu2 * mu2 - 30. * mu2 + 3.) / 8.;
+   const double p2 = 1.5 * mu2 - .5;     /* Danby, p. 115 */
+
+   return( (j2 * p2 + j3 * p3 / r + j4 * p4 / r2) / (r * r2));
+// return( (          j3 * p3 / r + j4 * p4 / r2) / (r * r2));
+}
+
+#define EARTH_MAJOR_AXIS 6378140.
+#define EARTH_R (EARTH_MAJOR_AXIS / AU_IN_METERS)
+#define EARTH_R2 (EARTH_R * EARTH_R)
+#define EARTH_R3 (EARTH_R * EARTH_R2)
+#define J2_IN_EARTH_UNITS (1.0826355254e-3)
+#define J3_IN_EARTH_UNITS (-2.5325505977e-6)
+#define J4_IN_EARTH_UNITS (-1.62870177e-6)
+#define EARTH_J2 (J2_IN_EARTH_UNITS * EARTH_R2)
+#define EARTH_J3 (J3_IN_EARTH_UNITS * EARTH_R3)
+#define EARTH_J4 (J4_IN_EARTH_UNITS * EARTH_R3 * EARTH_R)
+
+int main( const int argc, const char **argv)
+{
+   const double lat = atof( argv[1]) * PI / 180.;
+   const double lon = atof( argv[2]) * PI / 180.;
+   int n_terms = 99999;
+   size_t i;
+   double oval;
+   long double loc[3];
+   double derivs[3], dpot;
+   const double earth_gm_mks = 0.3986004415E+15;   /* GGM03 value, in m^3/s^2 */
+   const double earth_gm_aud = earth_gm_mks * seconds_per_day * seconds_per_day
+               / (AU_IN_METERS * AU_IN_METERS * AU_IN_METERS);
+   const double omega = 7292115e-11;           /* in radians/second */
+   const double earth_minor_axis = 6356755.;    /* polar radius */
+   const double centrifugal_pot_at_equator =
+         EARTH_MAJOR_AXIS * EARTH_MAJOR_AXIS * EARTH_MAJOR_AXIS * omega * omega / earth_gm_mks;
+   const double r = atof( argv[3]);
+   double delta = r * .0001 * EARTH_MAJOR_AXIS / AU_IN_METERS;
+
+   assert( argc > 3);
+   assert( r > 0.);
+   if( argc > 4)
+      n_terms = atoi( argv[4]);
+   loc[0] = (long double)( cos( lon) * cos( lat));
+   loc[1] = (long double)( sin( lon) * cos( lat));
+   loc[2] = (long double)  sin( lat);
+   for( i = 0; i < 3; i++)       /* cvt distances to AU */
+      loc[i] *= EARTH_R;
+   _starting_term = (argc > 5 ? 1 : 0);
+   oval = (double)geo_potential_in_au( loc[0], loc[1],
+                  loc[2] * earth_minor_axis / EARTH_MAJOR_AXIS, derivs, n_terms);
+   oval = 1 + oval * EARTH_R / earth_gm_aud;
+   oval -= centrifugal_pot_at_equator * cos( lat) * cos( lat) / 2.;
+   printf( "%e  (geoid height %f meters)\n", oval,
+                 -14497.68 - oval * EARTH_MAJOR_AXIS);
+                     /* cvt radius from units of earth radii to AU: */
+   printf( "  %e\n", jn_potential( loc[0] * AU_IN_METERS / EARTH_MAJOR_AXIS,
+                                   loc[1] * AU_IN_METERS / EARTH_MAJOR_AXIS,
+                                   loc[2] * AU_IN_METERS / EARTH_MAJOR_AXIS,
+                                   EARTH_J2, EARTH_J3, EARTH_J4));
+   for( i = 0; i < 3; i++)
+      loc[i] *= r;
+   printf( "  %e\n",
+              geo_potential_in_au( loc[0], loc[1], loc[2], derivs, n_terms));
+   printf( "  Derivs: %.10e %.10e %.10e (analytical)\n", derivs[0], derivs[1], derivs[2]);
+   for( size_t i = 0; i < 3; i++)
+      derivs[i] *= AU_IN_METERS / ((double)seconds_per_day * (double)seconds_per_day);
+   printf( "  Derivs: %.10e %.10e %.10e (analytical, m/s^2)\n", derivs[0], derivs[1], derivs[2]);
+
+   dpot = geo_potential_in_au( loc[0] + delta, loc[1], loc[2], NULL, n_terms)
+        - geo_potential_in_au( loc[0] - delta, loc[1], loc[2], NULL, n_terms);
+   derivs[0] = .5 * dpot / delta;
+   dpot = geo_potential_in_au( loc[0], loc[1] + delta, loc[2], NULL, n_terms)
+        - geo_potential_in_au( loc[0], loc[1] - delta, loc[2], NULL, n_terms);
+   derivs[1] = .5 * dpot / delta;
+   dpot = geo_potential_in_au( loc[0], loc[1], loc[2] + delta, NULL, n_terms)
+        - geo_potential_in_au( loc[0], loc[1], loc[2] - delta, NULL, n_terms);
+   derivs[2] = .5 * dpot / delta;
+   printf( "  Derivs: %.10e %.10e %.10e (numerical, AU/day^2)\n", derivs[0], derivs[1], derivs[2]);
+   printf( "Lat %c%f Long %c%f\n",
+         (lat > 0. ? 'N' : 'S'), fabs( lat) * 180. / PI,
+         (lon > 0. ? 'E' : 'W'), fabs( lon) * 180. / PI);
+
+   for( i = 0; i < 3; i++)
+      loc[i] *= AU_IN_METERS / EARTH_MAJOR_AXIS;
+   delta *= AU_IN_METERS / EARTH_MAJOR_AXIS;
+   dpot = jn_potential( loc[0] + delta, loc[1], loc[2], EARTH_J2, EARTH_J3, EARTH_J4)
+        - jn_potential( loc[0] - delta, loc[1], loc[2], EARTH_J2, EARTH_J3, EARTH_J4);
+   derivs[0] = .5 * dpot / delta;
+   dpot = jn_potential( loc[0], loc[1] + delta, loc[2], EARTH_J2, EARTH_J3, EARTH_J4)
+        - jn_potential( loc[0], loc[1] - delta, loc[2], EARTH_J2, EARTH_J3, EARTH_J4);
+   derivs[1] = .5 * dpot / delta;
+   dpot = jn_potential( loc[0], loc[1], loc[2] + delta, EARTH_J2, EARTH_J3, EARTH_J4)
+        - jn_potential( loc[0], loc[1], loc[2] - delta, EARTH_J2, EARTH_J3, EARTH_J4);
+   derivs[2] = .5 * dpot / delta;
+   printf( "  Derivs: %.10e %.10e %.10e (numerical, m/s^2, Jn)\n", derivs[0], derivs[1], derivs[2]);
+   return( 0);
+}
+
+/*
+   Comparisons made to
+
+http://geographiclib.sourceforge.net/cgi-bin/GeoidEval?input=44+-69.9&option=Submit
+
+0 0:       17.226  16.927145
+45 0:      46.767  47.289086
+90 0:      14.898  14.898461
+0 120:     59.82   58.211502
+0 100:     -6.92   -6.904056
+0 80:    -102.59 -102.701770
+0 60:     -62.59  -62.740079
+10 125:    63.91   64.616471
+44 -69.9: -26.70  -26.649304
+-10 -125: -10.25  -10.678747
+lat lon
+         online   geo_pot.c
+
+   Note that rearrangement of the order of computation has changed the results
+by a millimeter or so...
+
+phred@phred:~/find_orb$ ./geo_pot 0 0 1 19
+  -2.085725e-05
+  Derivs: 4.8973461530e-01 2.3583555353e-06 -5.7623158275e-06 (analytical)
+  Derivs: 9.8142864339e+00 4.7261467768e-05 -1.1547686499e-04 (analytical, m/s^2)
+  Derivs: 4.8973462022e-01 2.3583549381e-06 -5.7623145439e-06 (numerical, AU/day^2)
+phred@phred:~/find_orb$ ./geo_pot 31.4 159 1 19
+  -2.084797e-05
+  Derivs: -3.8937807981e-01 1.4946019510e-01 2.5541973048e-01 (analytical)
+  Derivs: -7.8031404906e+00 2.9951837573e+00 5.1186138726e+00 (analytical, m/s^2)
+  Derivs: -3.8937808013e-01 1.4946019321e-01 2.5541972839e-01 (numerical, AU/day^2)
+phred@phred:~/find_orb$ ./geo_pot 31.4 159 .8 19
+  -2.606101e-05
+  Derivs: -6.0807926146e-01 2.3343379352e-01 3.9961972747e-01 (analytical)
+  Derivs: -1.2185914289e+01 4.6780154831e+00 8.0083832089e+00 (analytical, m/s^2)
+  Derivs: -6.0807926193e-01 2.3343379057e-01 3.9961972424e-01 (numerical, AU/day^2) */
diff --git a/getstrex.c b/getstrex.cpp
similarity index 92%
rename from getstrex.c
rename to getstrex.cpp
index 38c14364..8ff060ef 100644
--- a/getstrex.c
+++ b/getstrex.cpp
@@ -2,7 +2,7 @@
 
 #define PDC_NCMOUSE
 
-#if defined( VT) || defined( XCURSES) || defined( _WIN32)
+#if defined( VT) || defined( XCURSES) || defined( _WIN32) || defined( __WATCOMC__)
    #define PDC_FORCE_UTF8
    #include <curses.h>
 #else
@@ -13,6 +13,8 @@
        #if defined(__has_include)
            #if __has_include( <ncursesw/cursesw.h>)
                #include <ncursesw/cursesw.h>
+           #elif __has_include( <cursesw.h>)
+               #include <cursesw.h>
            #else
                #include <curses.h>
            #endif
@@ -71,6 +73,16 @@ int wget_wch(WINDOW *win, wint_t *wch)
 /* At least for the nonce,  the cursor will be 'normal' in overwrite mode
 and 'very visible' in insert mode.     */
 
+#ifdef __PDCURSESMOD__
+   #define _HAVE_OPAQUE_SCREEN_FUNCS
+#endif
+
+#ifdef NCURSES_VERSION_PATCH
+   #if NCURSES_VERSION_PATCH >= 20230812
+      #define _HAVE_OPAQUE_SCREEN_FUNCS
+   #endif
+#endif
+
 #define CURSOR_INSERT      2
 #define CURSOR_OVERWRITE   1
 
@@ -89,9 +101,9 @@ reposition the cursor using the mouse.
       outside the text area,  that key is returned.  The calling routine
       can then handle that key/click and re-start this function if desired.
 
-   -- Unfortunately,  there's no way to tell if echo,  cbreak,  or nodelay
-      have been called without getting into Curses internals.  So these are
-      only restored in PDCurses.
+   -- Unfortunately,  there's no way to tell if echo() or cbreak() have
+      been called without getting into Curses internals.  So these are only
+      restored in PDCursesMod.
 
    -- Currently in wide-char form only.  That's the only one I actually use.
 
@@ -104,11 +116,11 @@ int wgetn_wstr_ex(WINDOW *win, wint_t *wstr, int *loc, const int maxlen, const i
 {
     int i, x, y, offset = 0, initial_cursor_state;
     int rval = -1;
-#ifdef __PDCURSES__
-    const bool oldcbreak = PDC_getcbreak( ); /* remember states */
-    const bool oldecho = PDC_getecho( );
-    const bool oldnodelay = win->_nodelay;
+#ifdef _HAVE_OPAQUE_SCREEN_FUNCS
+    const int oldcbreak = is_cbreak( ); /* remember states */
+    const int oldecho   = is_echo( );
 #endif
+    const bool oldnodelay = is_nodelay( win);
 
     assert( win);
     assert( wstr);
@@ -290,11 +302,12 @@ int wgetn_wstr_ex(WINDOW *win, wint_t *wstr, int *loc, const int maxlen, const i
                    break;
             }
     }
-#ifdef __PDCURSES__
+#ifdef _HAVE_OPAQUE_SCREEN_FUNCS
     oldcbreak ? cbreak( ) : nocbreak( );     /* restore states */
     oldecho ? echo( ) : noecho( );
-    win->_nodelay = oldnodelay;
 #endif
+    if( oldnodelay)
+       nodelay( win, TRUE);
     curs_set( initial_cursor_state);
     return rval;
 }
diff --git a/header.htm b/header.htm
index 6ffa64f4..8e6b67b3 100644
--- a/header.htm
+++ b/header.htm
@@ -1,7 +1,7 @@
 # Header for pseudo-MPECs.  You can customize this without much trouble.
 # '$Name$' will be replaced with the object name; '$Tg$' with the time the
 # pseudo-MPEC was generated; $Incl$ with the inclination in degrees,  and
-# so on.
+# so on.  IMPORTANT : modify non-English *header.htm files to match!
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <HTML>
 <HEAD>
@@ -23,19 +23,16 @@
 $Error      # The server flavor of Find_Orb inserts error messages here.
 <ul>
 <li> <a href="#ast_xx"> Astrometry </a> </li>
+<li> <a href="#stations"> Observing stations </a> </li>
+<li> <a href="#elements_xx"> Orbital elements </a> </li>
+<li> <a href="#residuals_xx"> $ResTy$ </a> </li>
+<li> <a href="#eph_xx"> Ephemeris </a> </li>
 # neocp_only 1    These lines only make sense for NEOCP objects:
+
 <li> <a href="https://cgi.minorplanetcenter.net/cgi-bin/showobsorbs.cgi?Obj=$Name$&amp;obs=y"> Astrometry (from NEOCP,  if available) </a> </li>
 <li> <a href="https://cneos.jpl.nasa.gov/scout/#/object/$Name$"> 'Scout' (JPL) information </a> </li>
+<li> <a href="https://neofixer.arizona.edu/site/500/$Name$"> NEOfixer information </a> </li>
 # neocp_only 0
-<li> <a href="#stations"> Observing stations </a> </li>
-<li> <a href="#elements_xx"> Orbital elements </a> </li>
-<li> <a href="#residuals_xx"> Residuals </a> </li>
-<li> <a href="#eph_xx"> Ephemeris </a> </li>
-# helio_only 1
-<li> <a href="http://skyview.gsfc.nasa.gov/cgi-bin/skymorph/mobssel.pl?target=&amp;NEAT=on&amp;OE_EPOCH=$EpJD$&amp;OE_EC=$ecc$&amp;OE_QR=$q$&amp;OE_TP=$T$&amp;OE_OM=$Node$&amp;OE_W=$Peri$&amp;OE_IN=$Incl$&amp;OE_H=$H$"> Click here to search NEAT images for this object using Skymorph </a> </li>
-<li> <a href="http://skyview.gsfc.nasa.gov/cgi-bin/skymorph/mobssel.pl?target=&amp;DSS2=on&amp;OE_EPOCH=$EpJD$&amp;OE_EC=$ecc$&amp;OE_QR=$q$&amp;OE_TP=$T$&amp;OE_OM=$Node$&amp;OE_W=$Peri$&amp;OE_IN=$Incl$&amp;OE_H=$H$"> Click here to search DSS2 images for this object using Skymorph </a> </li>
-<li> <a href="http://skyview.gsfc.nasa.gov/cgi-bin/skymorph/mobssel.pl?target=&amp;Spacewatch=on&amp;OE_EPOCH=$EpJD$&amp;OE_EC=$ecc$&amp;OE_QR=$q$&amp;OE_TP=$T$&amp;OE_OM=$Node$&amp;OE_W=$Peri$&amp;OE_IN=$Incl$&amp;OE_H=$H$"> Click here to search Spacewatch images for this object using Skymorph </a> </li>
-# helio_only 0
 </ul>
 <p>
 <input type = "button" value = "Orbit Simulator View" onclick = "window.open('http://orbitsimulator.com/gravitySimulatorCloud/yr/gsim2023.html?sv,1,$SV$')">
diff --git a/hints.txt b/hints.def
similarity index 100%
rename from hints.txt
rename to hints.def
diff --git a/jpl_eph.txt b/jpl_eph.txt
index d0d98c81..683538c9 100644
--- a/jpl_eph.txt
+++ b/jpl_eph.txt
@@ -22,95 +22,102 @@ unix.406
 ; 1600-2200:  about 56 MBytes:
 unix.405
 
-; http://cococubed.asu.edu/codes/ephem/unxp1600-2200_ppc_mac_xlf.405
+; From the Willmann-Bell CD-ROM:
+; 1600-2169:  about 43 MBytes:
+unix.200
+
+; (dead) http://cococubed.asu.edu/codes/ephem/unxp1600-2200_ppc_mac_xlf.405
 ; Same file as above,  I think
 unxp1600-2200_ppc_mac_xlf.405
 
-; http://cococubed.asu.edu/codes/ephem/unxp1600-2200_intel_mac_ifort.405
+; (dead) http://cococubed.asu.edu/codes/ephem/unxp1600-2200_intel_mac_ifort.405
 ; Same file as above,  I think,  except reversed byte order
 unxp1600-2200_intel_mac_ifort.405
 
+; From the second Guide 8.0 disk: 1800-2200,  about 13.3 MBytes:
+sub_de.406
+
 ; From the Guide 9.0 DVD:
 ; -3000 to +3000: about 557 MBytes:
 jpl_eph.422
 
-; Same file as above,  under a different name,  available at
+; Following is the same file as above,  under a different name
+; DE-422,  from -3000 to +3000 (545 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de422/lnxm3000p3000.422
-; (about 545 MBytes)
 lnxm3000p3000.422
 
-; Similar files from same site:
+; DE-421, 1900 to 2053 (13 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de421/lnxp1900p2053.421
-; (about 13 MBytes)
 lnxp1900p2053.421
+
+; DE-423,  1900 to 2050 (13 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de423/lnxp1900.423
-; (about 13.6 MBytes, 1900-2050)
 lnxp1900.423
 
+; DE-423,  1800 to 2200 (37 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de423/lnxp1800p2200.423
-; (about 37 MBytes)
 lnxp1800p2200.423
 
+; DE-418,  1900 to 2050 (13 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de418/lnxp1900p2050.418
-; (about 13 MBytes)
 lnxp1900p2050.418
+
+; DE-414,  1600 to 2200 (55 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de414/lnxp1600p2200.414
-; (about 55 MBytes)
 lnxp1600p2200.414
-;https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de405/lnxp1600p2200.405
-; (about 55 MBytes)
+
+; DE-405,  1600 to 2200 (55 MBytes)
+; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de405/lnxp1600p2200.405
 lnxp1600p2200.405
+
+; DE-406, -3000 to +3000 (200 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de406/lnxm3000p3000.406
-; (about 200 MBytes)
 lnxm3000p3000.406
+
+; DE-403, 1600 to 2200 (55 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de403/lnxp1600p2200.403
-; (about 55 MBytes)
 lnxp1600p2200.403
 
-; From the second Guide 8.0 disk: 1800-2200,  about 13.3 MBytes:
-sub_de.406
-
-; https://ssd.jpl.nasa.gov/ftp/eph/planets/unix/de406/unxp1800.406
-; Covers 1800-2100 (now renamed as shown above)
+; DE-406,  1800 to 2100
+; (dead) https://ssd.jpl.nasa.gov/ftp/eph/planets/unix/de406/unxp1800.406
 unxp1800.406
 
-; http://adams.dm.unipi.it/~orbmaint/orbfit/JPLEPH/DE405_win.dat
-; 1900-2060;  about 14 MBytes (file size indicates it may cover more years)
+; DE-405,  1900-2060 (14 MBytes)
+; https://adams.dm.unipi.it/~orbmaint/orbfit/JPLEPH/DE405_win.dat
 DE405_win.dat
 
-; http://adams.dm.unipi.it/~orbmaint/orbfit/JPLEPH/DE405.dat
-; 1970-2020;  about 4.7 MBytes
+; DE-405,  1970-2060 (4.5 MBytes)
+; https://adams.dm.unipi.it/~orbmaint/orbfit/JPLEPH/DE405.dat
 DE405.dat
 
-; From the Willmann-Bell CD-ROM:
-; 1600-2169:  about 43 MBytes:
-unix.200
-
 ; Recently (mid-2013) JPL created extra-long ephemerides.  The 430t version
 ; had a name change;  both possible names are checked.
 
 jpleph.431
 jpleph.430
-; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de430/linkp1550p2650.430
-linkp1550p2650.430
+
+; DE-430, 1550 to 2650 (97.5 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de430/linux_p1550p2650.430
 linux_p1550p2650.430
+
+; DE-430, 1550 to 2650 (94.1 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de430t/linux_p1550p2650.430t
 linux_p1550p2650.430t
 
+; DE-431, -1300 to +17000 (2600 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de431/lnxm13000p17000.431
 lnxm13000p17000.431
 
+; DE-440, 1550 to 2650 (97.5 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de440/linux_p1550p2650.440
-; 100 MBytes
 linux_p1550p2650.440
 
+; DE-440t, 1550 to 2650 (107.5 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de440t/linux_p1550p2650.440t
-; 110 MBytes
 linux_p1550p2650.440t
 
+; DE-441, -13000 to +17000 (2723 MBytes)
 ; https://ssd.jpl.nasa.gov/ftp/eph/planets/Linux/de441/linux_m13000p17000.441
-; 2723 MBytes
 linux_m13000p17000.441
 
 ; IMCCE (formerly Bureau des Longitudes) provides ephems in JPL-like format that
@@ -118,20 +125,21 @@ linux_m13000p17000.441
 ; they start blocks at noon instead of midnight.  Some programs are confused
 ; by this.)
 
+; INPOP-19a, 1900 to 2100 (17 MBytes)
 ; https://ftp.imcce.fr/pub/ephem/planets/inpop19a/inpop19a_TDB_m100_p100_littleendian.dat
-; (17 MBytes)
 inpop19a_TDB_m100_p100_littleendian.dat
 
+; INPOP-19a, 1000 to 3000 (168 MBytes)
 ; https://ftp.imcce.fr/pub/ephem/planets/inpop19a/inpop19a_TDB_m1000_p1000_littleendian.dat
-; (168 MBytes)
 inpop19a_TDB_m1000_p1000_littleendian.dat
 
+; INPOP-21a, 1900 to 2100 (17 MBytes)
 ; https://ftp.imcce.fr/pub/ephem/planets/inpop21a/inpop21a_TDB_m100_p100_littleendian.dat
 ; (17 MBytes)
 inpop21a_TDB_m100_p100_littleendian.dat
 
+; INPOP-21a, 1000 to 3000 (168 MBytes)
 ; https://ftp.imcce.fr/pub/ephem/planets/inpop21a/inpop21a_TDB_m1000_p1000_littleendian.dat
-; (168 MBytes)
 inpop21a_TDB_m1000_p1000_littleendian.dat
 
 sm_eph.440
diff --git a/lsquare.cpp b/lsquare.cpp
index 16f318db..8fd9c733 100644
--- a/lsquare.cpp
+++ b/lsquare.cpp
@@ -44,10 +44,10 @@ idea for nearly-singular matrices.  */
       112 bits of precision.  Either is better than "ordinary" doubles
       with a mere 52 bits of precision.   */
 
-#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 && !defined( __arm__)
-#define ldouble    __float128
+#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 && !defined( __arm__) && !defined( __aarch64_)
+   #define ldouble    __float128
 #else
-#define ldouble    long double
+   #define ldouble    long double
 #endif
 
 #define LSQUARE struct lsquare
@@ -167,7 +167,7 @@ static ldouble pivot_value( const ldouble *line, const unsigned line_size)
    return( sum_squares ? square0 / sum_squares : 0.);
 }
 
-#define swap_ldoubles( a, b)   { const ldouble temp = a;  a = b;  b = temp; }
+#define swap_ldoubles( a, b)   { const ldouble __temp = a;  a = b;  b = __temp; }
 
 static ldouble *calc_inverse( const ldouble *src, const int size)
 {
diff --git a/makefile b/makefile
index 2b2a952b..39b72b29 100644
--- a/makefile
+++ b/makefile
@@ -61,8 +61,10 @@ ifdef MSWIN
 	EXE=.exe
 	CURSES_LIB=-lpdcurses
 	MKDIR=-mkdir
+	DEFAULT_PREFIX=..
 else
 	MKDIR=mkdir -p
+	DEFAULT_PREFIX=~
 endif
 
 # You can have your include files in ~/include and libraries in
@@ -70,14 +72,14 @@ endif
 # (with root privileges) you can install them to /usr/local/include
 # and /usr/local/lib for all to enjoy.
 
-PREFIX?=~
+PREFIX?=$(DEFAULT_PREFIX)
 ifdef GLOBAL
 	INSTALL_DIR=/usr/local
 else
 	INSTALL_DIR=$(PREFIX)
 endif
-ifneq ($(PREFIX),~)
-	# enable the automatic setup of ~/.find_orb dir from
+ifneq ($(PREFIX),$(DEFAULT_PREFIX))
+	# enable the automatic setup of ../.find_orb dir from
 	# $PREFIX/share/openorb.  This at the moment requires C++17 features
 	# and works on Linux and macOS
 	CXXFLAGS+=-DCONFIG_DIR_AUTOCOPY=1 -std=c++17
@@ -85,7 +87,7 @@ endif
 
 ifdef X
 	CURSES_FLAGS=-DXCURSES -I../PDCursesMod
-	CURSES_LIB=-lXCurses -lXaw -lXmu -lXt -lX11 -lSM -lICE -lXext -lXpm
+	CURSES_LIB=$(HOME)/PDCursesMod/x11new/libpdcurses.a -lX11 -lpthread
 endif
 
 ifdef VT
@@ -93,6 +95,11 @@ ifdef VT
 	CURSES_LIB=-lpdcurses
 endif
 
+ifdef DRM
+	CURSES_FLAGS=-DVT -I$(HOME)/PDCursesMod
+	CURSES_LIB=$(HOME)/PDCursesMod/fb/libpdcurses.a -ldrm
+endif
+
 LIB_DIR=$(INSTALL_DIR)/lib
 
 ifdef W64
@@ -127,18 +134,26 @@ endif
 
 all: $(FO_EXE) $(FIND_ORB_EXE) fo_serve.cgi eph2tle$(EXE)
 
-CXXFLAGS+=-c -Wall -pedantic -Wextra -Werror $(ADDED_CXXFLAGS) -I $(INSTALL_DIR)/include
+CXXFLAGS+=-c -Wall -pedantic -Wextra $(ADDED_CXXFLAGS) -I $(INSTALL_DIR)/include
+
+ifndef NO_ERRORS
+	CXXFLAGS += -Werror
+endif
+
+ifdef UCHAR
+	CXXFLAGS += -funsigned-char
+endif
 
 ifdef DEBUG
-	CXXFLAGS += -g -O0
+	CXXFLAGS += -g -Og
 else
 	CXXFLAGS += -O3
 endif
 
-OBJS=ades_out.o b32_eph.o bc405.o bias.o collide.o conv_ele.o details.o eigen.o \
+OBJS=ades_out.o bc405.o bias.o collide.o conv_ele.o details.o eigen.o \
 	elem2tle.o elem_out.o elem_ou2.o ephem0.o errors.o expcalc.o gauss.o \
-	geo_pot.o healpix.o lsquare.o miscell.o         monte0.o \
-	mpc_obs.o nanosecs.o orb_func.o orb_fun2.o pl_cache.o roots.o  \
+	geo_pot.o healpix.o lsquare.o miscell.o monte0.o \
+	mpc_obs.o orb_func.o orb_fun2.o pl_cache.o roots.o  \
 	runge.o shellsor.o sigma.o simplex.o sm_vsop.o sr.o stackall.o
 
 miscell.o: prefix.h
@@ -190,40 +205,46 @@ findorb.o:         findorb.cpp
 clipfunc.o:        clipfunc.cpp
 	$(CXX) $(CXXFLAGS) $(CURSES_FLAGS) $<
 
-getstrex.o:        getstrex.c
-	$(CC) $(CXXFLAGS) $(CURSES_FLAGS) $<
+getstrex.o:        getstrex.cpp
+	$(CXX) $(CXXFLAGS) $(CURSES_FLAGS) $<
 
-$(FO_EXE):          fo.o $(OBJS) $(RES_FILENAME)
+$(FO_EXE):           fo.o $(OBJS) $(RES_FILENAME)
 	$(CXX) -o $(FO_EXE) fo.o $(OBJS) $(LIBS) $(RES_FILENAME) $(LDFLAGS)
 
 eph2tle$(EXE):          eph2tle.o conv_ele.o elem2tle.o simplex.o lsquare.o
 	$(CXX) -o eph2tle$(EXE) eph2tle.o conv_ele.o elem2tle.o simplex.o lsquare.o $(LIBS)
 
-cssfield$(EXE):          cssfield.o
+cssfield$(EXE):           cssfield.o
 	$(CXX) -o cssfield$(EXE) cssfield.o $(LIBS)
 
 expcalc$(EXE):          expcalc.cpp
 	$(CXX) -o expcalc$(EXE) -Wall -Wextra -pedantic -DTEST_CODE expcalc.cpp
 
-roottest$(EXE):          roottest.o
+geo_max$(EXE):           geo_max.o geo_pot.o
+	$(CXX) -o geo_max$(EXE) geo_max.o geo_pot.o
+
+geo_test$(EXE):           geo_test.o geo_pot.o
+	$(CXX) -o geo_test$(EXE) geo_test.o geo_pot.o
+
+roottest$(EXE):           roottest.o roots.o
 	$(CXX) -o roottest$(EXE) roottest.o roots.o
 
-neat_xvt$(EXE):          neat_xvt.o
+neat_xvt$(EXE):           neat_xvt.o
 	$(CXX) -o neat_xvt$(EXE) neat_xvt.o
 
-fo_serve.cgi:          fo_serve.o $(OBJS)
+fo_serve.cgi:           fo_serve.o $(OBJS)
 	$(CXX) -o fo_serve.cgi fo_serve.o $(OBJS) $(LIBS)
 
-cvt_elem.cgi:	         cvt_elem.o
+cvt_elem.cgi:	          cvt_elem.o
 	$(CXX) -o cvt_elem.cgi cvt_elem.o $(LIBS)
 
-cvt_elem.o:         conv_ele.cpp
+cvt_elem.o:            conv_ele.cpp
 	$(CXX) $(CXXFLAGS) -o cvt_elem.o -DCGI_VERSION $<
 
 IDIR=$(PREFIX)/share/findorb/data
-ifeq ($(PREFIX),~)
+ifeq ($(PREFIX),$(DEFAULT_PREFIX))
 	# backwards compatibility
-	IDIR=~/.find_orb
+	IDIR=../.find_orb
 endif
 
 clean:
@@ -231,6 +252,7 @@ clean:
 	$(RM) fo_serve.cgi eph2tle.o eph2tle$(EXE) cssfield$(EXE)
 	$(RM) $(FIND_ORB_OBJS) cssfield.o neat_xvt.o neat_xvt$(EXE)
 	$(RM) prefix.h PREFIX
+	$(RM) geo_test.o geo_test geo_max.o geo_max
 ifdef RES_FILENAME
 	$(RM) $(RES_FILENAME)
 
@@ -239,10 +261,12 @@ $(RES_FILENAME): find_orb.ico find_orb.rc
 endif
 
 clean_temp:
+	$(RM) $(IDIR)/alt_eph.txt
 	$(RM) $(IDIR)/artsat.json
 	$(RM) $(IDIR)/bc405pre.txt
 	$(RM) $(IDIR)/cmt_sof.txt
 	$(RM) $(IDIR)/combined.json
+	$(RM) $(IDIR)/comments.txt
 	$(RM) $(IDIR)/covar.txt
 	$(RM) $(IDIR)/covar.json
 	$(RM) $(IDIR)/covar?.txt
@@ -257,7 +281,6 @@ clean_temp:
 	$(RM) $(IDIR)/elem_short.json
 	$(RM) $(IDIR)/ephemeri.txt
 	$(RM) $(IDIR)/ephemeri.json
-	$(RM) $(IDIR)/eph_json.txt
 	$(RM) $(IDIR)/gauss.out
 	$(RM) $(IDIR)/guide.txt
 	$(RM) $(IDIR)/guide?.txt
@@ -292,9 +315,9 @@ INSTALL_FILES= \
    bright.pgm bright2.pgm calendar.txt cometdef.sof command.txt cospar.txt \
    details.txt dosephem.txt dos_help.txt elem_pop.txt environ.def \
    eph2tle.txt eph_expl.txt eph_type.txt ?findorb.txt frame_he.txt \
-   geo_rect.txt header.htm jpl_eph.txt link_def.json mpc_area.txt \
+   geo_rect.txt header.htm hints.def jpl_eph.txt link_def.json mpc_area.txt \
    mpcorb.hdr mu1.txt nongravs.txt obj_help.txt obj_name.txt \
-   ObsCodes.htm ObsCodesF.html observer.txt obslinks.htm  \
+   ObsCodes.htm ObsCodesF.html observer.htm obslinks.htm  \
    odd_name.txt openfile.txt orbitdef.sof previous.def progcode.txt \
    radecfmt.txt residfmt.txt rovers.txt sat_xref.txt scope.json \
    scopes.txt splash.txt sigma.txt site_310.txt timehelp.txt xdesig.txt
@@ -310,7 +333,6 @@ else
 
 endif
 	$(CP) $(INSTALL_FILES) $(IDIR)
-	$(CP) -n hints.txt $(IDIR)
 
 uninstall:
 ifdef EXE
diff --git a/miscell.cpp b/miscell.cpp
index 98ed9de3..a685cc09 100644
--- a/miscell.cpp
+++ b/miscell.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <errno.h>
 #include "stringex.h"
 #include "mpc_func.h"
+#include "mpc_obs.h"
 
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #ifdef __GNUC__
@@ -56,16 +57,20 @@ namespace fs = ghc::filesystem;
 
 #endif
 
+/* For Microsoft Windows and MS-DOS,  there is no 'home' directory and
+therefore no ~/.find_orb configuration directory.  The configuration files
+therefore live in the same directory as Find_Orb,  meaning we #define
+CONFIG_IS_LOCAL for such cases.        */
+
 #if defined( _WIN32) || defined( __WATCOMC__)
    #include <direct.h>        /* for _mkdir() definition */
+   #define CONFIG_IS_LOCAL
 #else
    #include <sys/stat.h>
    #include <sys/types.h>
    #include <unistd.h>
 #endif
 
-const char *get_find_orb_text( const int index);
-
 /* This function allows one to put the following options in front of
 the 'permits' string :
 
@@ -73,36 +78,22 @@ t  File is temporary (doesn't actually have an effect yet).
 f  If the file isn't opened,  a fatal error message is shown.
 c  Configuration file:  look for it in ~/.find_orb (for Linux) or in
    the directory in which Find_Orb is running (Windows).
-l  Try opening locally;  if that fails,  try the config directory.
 
    One can combine these.  For example, 'permits' of tfcw would
 tell the function that the file is a temporary one,  should be
 opened within the configuration directory for writing,  and that
-if it can't be opened, it's a fatal error.  'cl' = try config,
-then local; 'lc' = try local,  then config;  'c' = try config
-only.
-
-   I'm still working out the degree to which a separate directory
-for these files will be needed.  In the past,  find_orb,  fo,
-and fo_serve.cgi simply read what they needed from the current
-folder.  At present,  the only case in which use_config_directory
-is 'true' is for console Find_Orb in Linux,  and even there,  you
-can turn it back to 'false'.
-*/
+if it can't be opened, it's a fatal error.      */
 
-#ifndef _WIN32
-int get_temp_dir( char *name, const size_t max_len);      /* miscell.cpp */
-#endif
 int fetch_astrometry_from_mpc( FILE *ofile, const char *desig);
+int download_a_file( const char *ofilename, const char *url);
 int generic_message_box( const char *message, const char *box_type);
 const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
 char *make_config_dir_name( char *oname, const char *iname);  /* miscell.cpp */
 int reset_astrometry_filename( int *argc, const char **argv);
 uint64_t parse_bit_string( const char *istr);                /* miscell.cpp */
-const char *write_bit_string( char *ibuff, const uint64_t bits);
-
-int use_config_directory = false;
+const char *write_bit_string( char *ibuff, const uint64_t bits,
+                                          const size_t max_bitstring_len);
 const char *alt_config_directory;
 
 #ifndef CONFIG_DIR_AUTOCOPY
@@ -118,15 +109,15 @@ void ensure_config_directory_exists()
 // Going forward it'd be good to reqork Find_Orb to search for data in
 // default directories if local copies don't exist
 #include "prefix.h"
+static char PREFIX_STATIC[500] = PREFIX;
 void ensure_config_directory_exists()
 {
-   if (!use_config_directory)
-      return;
-
    // The c_str() magic in the next line allows conda-build's prefix
    // replacer to work as expected.
    // See https://github.com/conda/conda-build/issues/1674 for details.
-   std::string prefix = std::string(PREFIX).c_str();
+   // Modified on 2023-03-17 to add PREFIX_STATIC as compilers have
+   // gotten too clever & the existing workaround stopped working.
+   std::string prefix = std::string(PREFIX_STATIC).c_str();
 
    if (prefix == "~") {
       // backwards compatibility; do nothing.
@@ -161,84 +152,118 @@ void ensure_config_directory_exists()
 }
 #endif
 
-/* Users may specify files such as ~/this/that.txt on non-Windows boxes.
-The following function replaces ~ with the home directory. */
+void fix_home_dir( char *filename);    /* ephem0.cpp */
+
+/* In Windows or DOS,  the 'default config directory name' will be
+the one in which Find_Orb is running.  (Currently assumed to be the
+default directory,  but it'd be a good idea to check argv[0].)
+
+   On everything else,  it will normally be in ~/.find_orb.  On
+Docker,  it'll be in /software/.find_orb.  On Puppy Linux,  where
+the only user is root,  it'll be in /root/.find_orb.
+
+   To figure out where it is,  we look for the file 'cospar.txt'
+(one of many files in the configuration directory,  and an unusual
+enough name to probably avoid collisions) in these three places.  If
+they all fail,  but an 'alt config directory' is specified,  we try
+that.  After that,  we give up. */
 
-static FILE *fopen_tilde( const char *filename, const char *permits)
+char *default_config_dir_name( char *oname, const char *iname)
 {
-#ifdef _WIN32
-   return( fopen( filename, permits));
+#ifdef CONFIG_IS_LOCAL           /* Microsoft Windows or MS-DOS */
+   if( oname)
+      strcpy( oname, iname);
 #else
-   if( *filename != '~' && filename[1] != '/')
-      return( fopen( filename, permits));
-   else
+   static char *config_dir = NULL;
+
+   if( !oname)       /* memory cleanup */
+      {
+      free( config_dir);
+      config_dir = NULL;
+      return( NULL);
+      }
+
+   if( !config_dir)
       {
-      char fullname[255];
+      const char *test_filename = "cospar.txt";
+      FILE *test_ifile = NULL;
+      int pass;
 
-      strlcpy_err( fullname, getenv( "HOME"), sizeof( fullname));
-      strlcat_err( fullname, filename + 1, sizeof( fullname));
-      return( fopen( fullname, permits));
+      for( pass = 0; !test_ifile && pass < 4; pass++)
+         {
+         *oname = '\0';
+         if( !pass)
+            strcpy( oname, "~");        /* usual case */
+         else if( pass == 1)
+            strcpy( oname, "/software");     /* Docker uses this */
+         else if( pass == 2)
+            strcpy( oname, "/root");         /* Puppy Linux uses this */
+         else if( pass == 3 && alt_config_directory)
+            strcpy( oname, alt_config_directory);
+         if( *oname)
+            {
+            fix_home_dir( oname);
+            if( pass < 3)
+               strcat( oname, "/.find_orb/");
+            strcat( oname, test_filename);
+            test_ifile = fopen( oname, "rb");
+            }
+         }
+      assert( test_ifile);
+      fclose( test_ifile);
+      oname[strlen( oname) - 10] = '\0';
+      config_dir = strdup( oname);
       }
+   strcpy( oname, config_dir);
+   strcat( oname, iname);
 #endif
+   return( oname);
 }
 
 char *make_config_dir_name( char *oname, const char *iname)
 {
-#ifndef _WIN32
-   char *home_ptr = getenv( "HOME");
-#endif
 
    if( alt_config_directory && *alt_config_directory)
       {
       strcpy( oname, alt_config_directory);
       strcat( oname, iname);
-      return( oname);
-      }
-#ifdef _WIN32
-   strcpy( oname, iname);
-#else
-   if( home_ptr)
-      {
-      strcpy( oname, home_ptr);
-      strcat( oname, "/.find_orb/");
       }
    else
-      *oname = '\0';
-   strcat( oname, iname);
-#endif
+      default_config_dir_name( oname, iname);
    return( oname);
 }
 
 const char *output_directory = NULL;
 
-#ifndef _WIN32
 int get_temp_dir( char *name, const size_t max_len)
 {
+#ifdef CONFIG_IS_LOCAL
+   if( output_directory)
+      strlcpy_err( name, output_directory, max_len);
+   else
+      *name = '\0';
+   return( 0);
+#else          /* non-Windows(R) or MS-DOS case : Linux, *BSD,  etc.  */
    static int process_id = 0;
 
    if( output_directory)
+      {
       strlcpy_err( name, output_directory, max_len);
+      fix_home_dir( name);
+      }
    else
       {
       const bool first_time = (process_id == 0);
 
       if( first_time)
-#if defined( _WIN32) || defined( __WATCOMC__)
-         process_id = 1;
-#else
          process_id = getpid( );
-#endif
       snprintf_err( name, max_len, "/tmp/find_orb%d", process_id);
       if( first_time)
-#if defined( _WIN32) || defined( __WATCOMC__)
-         _mkdir( name);
-#else
          mkdir( name, 0777);
-#endif
       }
    return( process_id);
-}
 #endif
+}
 
 /* We use a lock file to determine if Find_Orb is already running,  and
 therefore putting some temporary files (ephemerides,  elements,  etc.)
@@ -253,63 +278,71 @@ FILE *fopen_ext( const char *filename, const char *permits)
 {
    FILE *rval = NULL;
    bool is_fatal = false;
-   bool try_local = true;
    bool is_temporary = false;
+   bool is_config = false;
 
-   if( *permits == 't')
+   if( strchr( permits, 'l'))
       {
-#if !defined( _WIN32) && !defined( __WATCOMC__)
-      extern bool findorb_already_running;
-
-      is_temporary = findorb_already_running || (output_directory != NULL);
-#endif
-      permits++;
+      debug_printf( "fopen_ext( '%s', '%s') error\n", filename, permits);
+      assert( 0);
       }
-   if( *permits == 'f')
+
+   while( *permits != 'r' && *permits != 'w' && *permits != 'a')
       {
-      is_fatal = true;
-      permits++;
-      }
-   if( !use_config_directory || is_temporary)
-      while( *permits == 'l' || *permits == 'c')
-         permits++;
-   if( *permits == 'c' && strchr( filename, '/'))
-      permits++;              /* not really in the config directory */
-   if( permits[0] == 'l' && permits[1] == 'c')
-      {     /* try local,  then config version */
-      try_local = false;
-      permits++;
-      rval = fopen_tilde( filename, permits + 1);
+      const char c = *permits++;
+
+      if( c == 'f')
+         is_fatal = true;
+      else if( c == 'c')
+         is_config = true;
+      else if( c == 't')
+         is_temporary = true;
+      else
+         {
+         fprintf( stderr, "File '%s'\n", filename);
+         assert( 0);
+         }
       }
-#ifndef _WIN32
+
+   if( strchr( filename, '/'))
+      is_temporary = is_config = false;    /* filename has an explicit path */
+
    if( is_temporary)
       {
       char tname[255];
 
       get_temp_dir( tname, sizeof( tname));
-      snprintf_append( tname, sizeof( tname), "/%s",  filename);
-      rval = fopen( tname, permits);
+      if( *tname)
+         {
+         snprintf_append( tname, sizeof( tname), "/%s",  filename);
+         rval = fopen( tname, permits);
+         }
       }
-#endif
-   if( !rval && *permits == 'c' && !is_temporary)
-      {
-      char tname[255];
 
-      make_config_dir_name( tname, filename);
-      permits++;
-      if( *permits == 'l')       /* permits are 'cl' = check both */
-         permits++;
-      else                       /* check config version only */
-         try_local = false;
-      rval = fopen_tilde( tname, permits);
-      }
-   if( try_local && !rval && !is_temporary)
-      rval = fopen_tilde( filename, permits);
+   if( !rval)
+      if( is_temporary || is_config)
+         {
+         char tname[255];
+
+         if( alt_config_directory && *alt_config_directory)
+            {
+            strcpy( tname, alt_config_directory);
+            strcat( tname, filename);
+            rval = fopen( tname, permits);
+            }
+         if( !rval)    /* alt config directory didn't work */
+            {
+            default_config_dir_name( tname, filename);
+            rval = fopen( tname, permits);
+            }
+         }
+   if( !is_temporary && !is_config)
+      rval = fopen( filename, permits);
    if( !rval && is_fatal)
       {
       char buff[300];
 
-      sprintf( buff, "Error opening %s: %s",
+      snprintf( buff, sizeof( buff), "Error opening %s: %s",
                  filename, strerror( errno));
       generic_message_box( buff, "o");
       exit( -1);
@@ -395,9 +428,11 @@ files to provide NEOCP astrometry nor 'grab_mpc',  which will cause
 this code to always return 0 (i.e.,  no astrometry fetched.)
 */
 
+#define ERR_CODE_NO_DATA_AVAILABLE  (int)0xd100
+
 int fetch_astrometry_from_mpc( FILE *ofile, const char *desig)
 {
-   char tbuff[100];
+   char tbuff[300];
    int bytes_written = 0, pass;
    const char *grab_program = get_environment_ptr( "MPC_GRAB_PROGRAM");
 
@@ -445,8 +480,14 @@ int fetch_astrometry_from_mpc( FILE *ofile, const char *desig)
             bytes_written += (int)fwrite( tbuff, 1, strlen( tbuff), ofile);
          fclose( ifile);
          }
+      else if( err_code == ERR_CODE_NO_DATA_AVAILABLE)
+         {
+         snprintf_err( tbuff, sizeof( tbuff), get_find_orb_text( 2080), desig);
+         generic_message_box( tbuff, "o");
+         }
       else
          {
+         debug_printf( "Command '%s' failed\n", tbuff);
          debug_printf( "grab_mpc error code %d (%x) %s\n", err_code, err_code,
                      strerror( err_code));
          generic_message_box( get_find_orb_text( 2058), "o");
@@ -455,6 +496,23 @@ int fetch_astrometry_from_mpc( FILE *ofile, const char *desig)
    return( bytes_written);
 }
 
+int download_a_file( const char *ofilename, const char *url)
+{
+   const char *grab_program = get_environment_ptr( "MPC_GRAB_PROGRAM");
+   char *tbuff;
+   size_t buffsize;
+   int err_code;
+
+   if( !*grab_program)
+      grab_program = "grab_mpc";
+   buffsize = strlen( grab_program) + strlen( ofilename) + strlen( url) + 4;
+   tbuff = (char *)malloc( buffsize);
+   snprintf_err( tbuff, (int)buffsize, "%s %s %s", grab_program, ofilename, url);
+   err_code = system( tbuff);
+   free( tbuff);
+   return( err_code);
+}
+
 /* Code to write a single valid,  but completely meaningless observation
 to a temporary file for a specified object.  This can then be read in
 and used to get around the fact that Find_Orb essentially assumes that
@@ -522,7 +580,7 @@ int reset_astrometry_filename( int *argc, const char **argv)
          }
       if( argv[1][1] == 'f')
          {
-         FILE *ofile = fopen_ext( temp_obs_filename, "fwb");
+         FILE *ofile = fopen( temp_obs_filename, "wb");
 
          assert( ofile);
          fetch_astrometry_from_mpc( ofile, obj_name);
@@ -596,10 +654,9 @@ length is 122 bytes :
    but I lack a formal proof of this.  I'm sure 256 bytes will be more
 than enough.   */
 
-const char *write_bit_string( char *ibuff, const uint64_t bits)
+const char *write_bit_string( char *ibuff, const uint64_t bits, const size_t max_bitstring_len)
 {
    int i, j;
-   const size_t max_bitstring_len = 256;
 
    *ibuff = '\0';
    for( i = 0; i < 64; i++)
@@ -619,9 +676,29 @@ const char *write_bit_string( char *ibuff, const uint64_t bits)
    return( ibuff);
 }
 
+/* Very simple pattern matcher,  using ? and * only */
+
+int pattern_match(const char* pattern, const char* string)
+{
+   while( pattern[0])
+      if( pattern[0] == '*')
+            return pattern_match(pattern+1, string)
+                     || (string[0] && pattern_match(pattern, string+1));
+      else
+         {
+         if( pattern[0] == '?' && !string[0])
+            return 0;
+         if( pattern[0] != '?' && pattern[0] != string[0])
+            return 0;
+         pattern++;
+         string++;
+         }
+   return !string[0];
+}
+
 const char *find_orb_version_jd( double *jd)
 {
     if( jd)
-      *jd = 2459898.5;
-    return( "2022 Nov 15");
+      *jd = 2461186.5;
+    return( "2026 May 26");
 }
diff --git a/moid4.cpp b/moid4.cpp
index 615c7159..3c40b48f 100644
--- a/moid4.cpp
+++ b/moid4.cpp
@@ -35,10 +35,7 @@ the new code and (b) because the algorithm _is_ of some interest. */
 #include "watdefs.h"
 #include "comets.h"
 #include "afuncs.h"
-
-#define PI 3.1415926535897932384626433832795028841971693993751058209749445923
-#define GAUSS_K .01720209895
-#define SOLAR_GM (GAUSS_K * GAUSS_K)
+#include "constant.h"
 
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #ifdef __GNUC__
diff --git a/monte0.cpp b/monte0.cpp
index 23d5717a..833b2196 100644
--- a/monte0.cpp
+++ b/monte0.cpp
@@ -23,8 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "watdefs.h"
 #include "comets.h"
 #include "mpc_obs.h"
+#include "stringex.h"
 #include "afuncs.h"
 #include "monte0.h"
+#include "constant.h"
 
 double gaussian_random( void);                           /* monte0.c */
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
@@ -38,11 +40,12 @@ void set_up_observation( OBSERVE FAR *obs);                 /* mpc_obs.c */
 void set_obs_vect( OBSERVE FAR *obs);        /* mpc_obs.h */
 const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
 
-#define PI 3.1415926535897932384626433832795028841971693993751058209749445923
-
 void put_orbital_elements_in_array_form( const ELEMENTS *elem,
-                  double *output_array)
+               const double *nongravs, double *output_array)
 {
+   int i;
+   extern int n_orbit_params;
+
    output_array[MONTE_TP] = elem->perih_time;
    output_array[MONTE_ECC] = elem->ecc;
    output_array[MONTE_q] = elem->major_axis * (1. - elem->ecc);
@@ -54,16 +57,22 @@ void put_orbital_elements_in_array_form( const ELEMENTS *elem,
    output_array[MONTE_ASC_NODE] = elem->asc_node * 180. / PI;
    output_array[MONTE_EARTH_MOID] = 0.;
    output_array[MONTE_H] = elem->abs_mag;
+   for( i = MONTE_NONGRAVS; i < MONTE_N_ENTRIES; i++)
+      output_array[i] = 0.;
+   assert( nongravs || (6 == n_orbit_params));
+   assert( n_orbit_params < MONTE_N_ENTRIES - MONTE_NONGRAVS + 6);
+   for( int i = 0; i < n_orbit_params - 6; i++)
+      output_array[MONTE_NONGRAVS + i] = nongravs[i + 6];
 }
 
 void add_monte_orbit( double *monte_data, const ELEMENTS *elem,
-                  const int n_orbits)
+                const double *nongravs, const int n_orbits)
 {
    double tarr[MONTE_N_ENTRIES];
    double *offsets = monte_data + 2 * MONTE_N_ENTRIES;
    int i;
 
-   put_orbital_elements_in_array_form( elem, tarr);
+   put_orbital_elements_in_array_form( elem, nongravs, tarr);
    if( !n_orbits)                /* initializing step */
       for( i = 0; i < MONTE_N_ENTRIES; i++)
          {
@@ -298,13 +307,18 @@ char *put_double_in_buff( char *buff, const double ival)
    int i;
    double low_end = .999999;
 
+   if( isnan( ival))
+      {
+      strcpy( buff, "NaN");
+      return( buff);
+      }
    if( !precision)
       {
       precision = atoi( get_environment_ptr( "FULL_SIGMAS"));
       if( !precision)
          precision = 3;
       assert( precision > 0 && precision < 20);
-      snprintf( format, sizeof( format), "%%%d.%dg", precision + 7, precision);
+      snprintf_err( format, sizeof( format), "%%%d.%dg", precision + 7, precision);
       }
    for( i = precision; i; i--)
       low_end *= 10.;
@@ -313,7 +327,7 @@ char *put_double_in_buff( char *buff, const double ival)
       {
       char *tptr;
 
-      sprintf( buff, format, ival);
+      snprintf_err( buff, 20, format, ival);
       while( (tptr = strchr( buff, 'e')) != NULL
                      &&  tptr[2] == '0')
          {           /* remove a leading zero from exponent */
@@ -322,7 +336,7 @@ char *put_double_in_buff( char *buff, const double ival)
          }
       }
    else
-      sprintf( buff, "%*ld", precision + 7, (long)ival);
+      snprintf_err( buff, 20, "%*ld", precision + 7, (long)ival);
    while( *buff == ' ')
       buff++;
    return( buff);
@@ -394,20 +408,21 @@ double dump_monte_data_to_file( FILE *ofile, const double *sigmas,
    int i;
    char tbuff[40], *tptr;
    extern int available_sigmas;
+   extern int n_orbit_params;
 
    fprintf( ofile, "Planet orbiting: %d\n", planet_orbiting);
    fprintf( ofile, "Sigmas:\n");
-   for( i = 0; i < MONTE_N_ENTRIES; i++)
+   for( i = 0; i < MONTE_NONGRAVS; i++)
       {
       if( !strcmp( units_text[i], "deg"))
          {
          char zbuff[40];
 
-         sprintf( zbuff, "%.8f", sigmas[i]);
+         snprintf_err( zbuff, sizeof( zbuff), "%.8f", sigmas[i]);
          remove_insignificant_digits( zbuff);
          if( strlen( zbuff) == 10)   /* very low value */
             put_double_in_buff( zbuff, sigmas[i]);
-         sprintf( tbuff, "%10s", zbuff);
+         snprintf_err( tbuff, sizeof( tbuff), "%10s", zbuff);
          }
       else
          put_double_in_buff( tbuff, sigmas[i]);
@@ -423,8 +438,6 @@ double dump_monte_data_to_file( FILE *ofile, const double *sigmas,
 // if( semimajor_axis > sigma_a * .3)
    if( semimajor_axis > 0.)
       {
-      const double GAUSS_K = .01720209895;
-      const double SOLAR_GM = GAUSS_K * GAUSS_K;
       const double mass = get_planet_mass( planet_orbiting) / SOLAR_GM;
       const double per_yrs = semimajor_axis * sqrt( semimajor_axis / mass);
       const double days_per_year = 365.25;
@@ -464,6 +477,16 @@ double dump_monte_data_to_file( FILE *ofile, const double *sigmas,
       else
          uparam = 97.;     /* 'bogus' U */
       }
+   if( force_model == FORCE_MODEL_SRP)
+      {
+      put_double_in_buff( tbuff, sigmas[MONTE_NONGRAVS] * SOLAR_GM / SRP1AU);
+      fprintf( ofile, "Sigma_AMR: %s\n", tbuff);
+      }
+   else for( i = 0; i < n_orbit_params - 6; i++)
+      {
+      put_double_in_buff( tbuff, sigmas[MONTE_NONGRAVS + i]);
+      fprintf( ofile, "Sigma_A%d: %s\n", i + 1, tbuff);
+      }
    available_sigmas = MONTE_CARLO_SIGMAS_AVAILABLE;
    return( uparam);
 }
diff --git a/monte0.h b/monte0.h
index 4105dfe6..95825975 100644
--- a/monte0.h
+++ b/monte0.h
@@ -26,20 +26,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define MONTE_ASC_NODE     8
 #define MONTE_EARTH_MOID   9
 #define MONTE_H           10
+#define MONTE_NONGRAVS    11
 
-#define MONTE_N_ENTRIES   11
+#define MONTE_N_ENTRIES   16
 #define MONTE_DATA_SIZE   (3 * MONTE_N_ENTRIES)
 
 double *add_gaussian_noise_to_obs( int n_obs, OBSERVE *obs,
                  const double noise_in_sigmas);             /* monte0.cpp */
 void add_monte_orbit( double *monte_data, const ELEMENTS *elem,
-                  const int n_orbits);                      /* monte0.cpp */
+                const double *nongravs, const int n_orbits);  /* monte0.cpp */
 void compute_monte_sigmas( double *sigmas, const double *monte_data,
                   const int n_orbits);                      /* monte0.cpp */
 void restore_ra_decs_mags_times( unsigned n_obs, OBSERVE *obs,
                            const double *stored_ra_decs);
 void put_orbital_elements_in_array_form( const ELEMENTS *elem,
-                  double *output_array);                    /* monte0.cpp */
+               const double *nongravs, double *output_array);  /* monte0.cpp */
 double dump_monte_data_to_file( FILE *ofile, const double *sigmas,
             const double semimajor_axis, const double ecc,
             const int planet_orbiting);                       /* monte0.cpp */
diff --git a/mpc_obs.cpp b/mpc_obs.cpp
index 547faf02..e7671597 100644
--- a/mpc_obs.cpp
+++ b/mpc_obs.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <windows.h>
 #endif
 #include <stdarg.h>
-#include <assert.h>
+#include "assert2.h"
 #include <errno.h>
 #include "watdefs.h"
 #include "details.h"
@@ -48,12 +48,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "pl_cache.h"
 #include "constant.h"
 
+int pattern_match(const char* pattern, const char* string);   /* miscell.c */
 double utc_from_td( const double jdt, double *delta_t);     /* ephem0.cpp */
 int apply_excluded_observations_file( OBSERVE *obs, const int n_obs);
 void set_up_observation( OBSERVE FAR *obs);                 /* mpc_obs.c */
 static double observation_jd( const char *buff);
 double centralize_ang( double ang);             /* elem_out.cpp */
-int sort_obs_by_date_and_remove_duplicates( OBSERVE *obs, const int n_obs);
 char *fgets_trimmed( char *buff, size_t max_bytes, FILE *ifile); /*elem_out.c*/
 int lat_alt_to_parallax( const double lat, const double ht_in_meters,
              double *rho_cos_phi, double *rho_sin_phi, const int planet_idx);
@@ -74,18 +74,25 @@ int get_satellite_offset( const char *iline, double *xyz);  /* mpc_obs.cpp */
 int get_residual_data( const OBSERVE *obs, double *xresid, double *yresid);
 bool nighttime_only( const char *mpc_code);                 /* mpc_obs.cpp */
 char *find_numbered_mp_info( const int number);             /* mpc_obs.cpp */
+bool is_sungrazing_comet( const OBSERVE *obs, const int n_obs);  /* orb_func.c */
 static int xref_designation( char *desig);
 int debug_printf( const char *format, ...)                 /* mpc_obs.cpp */
 #ifdef __GNUC__
          __attribute__ (( format( printf, 1, 2)))
 #endif
 ;
+char *make_config_dir_name( char *oname, const char *iname);  /* miscell.cpp */
+int download_a_file( const char *ofilename, const char *url);
+const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
+void set_environment_ptr( const char *env_ptr, const char *new_value);
 char **load_file_into_memory( const char *filename, size_t *n_lines,
                         const bool fail_if_not_found);      /* mpc_obs.cpp */
 void shellsort_r( void *base, const size_t n_elements, const size_t esize,
          int (*compare)(const void *, const void *, void *), void *context);
+void *bsearch_ext( const void *key, const void *base0,
+      size_t nmemb, const size_t size,                   /* shellsor.cpp */
+      int (*compar)(const void *, const void *), bool *found);
 int string_compare_for_sort( const void *a, const void *b, void *context);
-const char *get_find_orb_text( const int index);      /* elem_out.cpp */
 static void reduce_designation( char *desig, const char *idesig);
 int set_tholen_style_sigmas( OBSERVE *obs, const char *buff);  /* mpc_obs.c */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
@@ -102,16 +109,20 @@ void compute_error_ellipse_adjusted_for_motion( double *sigma1, double *sigma2,
                   const MOTION_DETAILS *m);                  /* orb_func.cpp */
 double n_nearby_obs( const OBSERVE FAR *obs, const unsigned n_obs,
           const unsigned idx, const double time_span);       /* orb_func.cpp */
-void convert_ades_sigmas_to_error_ellipse( const double sig_ra,
+int convert_ades_sigmas_to_error_ellipse( const double sig_ra,
          const double sig_dec, const double correl, double *major,
          double *minor, double *angle);                      /* errors.cpp */
 
+#ifndef PATH_MAX
+   #define PATH_MAX 256
+#endif
+
 static void *_ades_ids_stack = NULL;
 
 int debug_printf( const char *format, ...)
 {
    const char *debug_file_name = "debug.txt";
-   FILE *ofile = fopen_ext( debug_file_name, "tca");
+   FILE *ofile = fopen_ext( debug_file_name, "ca");
 
    if( ofile)
       {
@@ -122,7 +133,7 @@ int debug_printf( const char *format, ...)
       if( ftell( ofile) > max_debug_file_size)
          {
          fclose( ofile);
-         ofile = fopen_ext( debug_file_name, "tcw");
+         ofile = fopen_ext( debug_file_name, "cw");
          }
       fprintf( ofile, "%02d:%02d:%02d ",
                ((int)t0 / 3600) % 24, ((int)t0 / 60) % 60, (int)t0 % 60);
@@ -185,13 +196,12 @@ static void remove_html_tags( char *buff)
 }
 
 /* By default,  Find_Orb will ignore observations before 1100 AD or after
-2300 AD.  I've never seen data _nearly_ as far back as that,  and while
-people do test extrapolated observations,  I don't think anybody goes out
-past 2200 AD.  If they do,  both 'fo' and interactive Find_Orb provide
-command line switches to reset the following values.     */
+2300 AD.  This range can be reset at runtime (see the '-r' option in
+findorb.cpp) or as a configuration parameter (see OBSERVATION_DATE_RANGE
+in environ.dat).        */
 
-double minimum_observation_jd = 2122832.5;  /* 1100 Jan 1 */
-double maximum_observation_jd = 2561117.5;  /* 2300 Jan 1 */
+double minimum_observation_jd = 0.;
+double maximum_observation_jd = 0;
 
 static bool is_in_range( const double jd)
 {
@@ -260,7 +270,7 @@ Otherwise,  zero will be returned. */
 #define OBS_FORMAT_WRONG_DESIG_PLACEMENT        2
 #define OBS_FORMAT_INCORRECT                    4
 
-static int fix_up_mpc_observation( char *buff)
+static int fix_up_mpc_observation( char *buff, double *jd)
 {
    size_t len = strlen( buff);
    int rval = 0;
@@ -291,8 +301,15 @@ static int fix_up_mpc_observation( char *buff)
    else
       check_packed_desig_alignment( buff);
    buff[12] = tchar;
-   if( len == 80 && observation_jd( buff))      /* doesn't need fixing */
-      return( rval);
+   if( len == 80)
+      {
+      double temp_jd = observation_jd( buff);
+
+      if( jd)
+         *jd = temp_jd;
+      if( temp_jd)      /* doesn't need fixing */
+         return( rval);
+      }
 
    if( len < 90)     /* avoid buffer overruns */
       {
@@ -392,26 +409,6 @@ static int fix_up_mpc_observation( char *buff)
    return( rval);
 }
 
-
-#ifndef _MSC_VER
-         /* All non-Microsoft builds are for the console */
-   #define CONSOLE
-#endif
-
-#ifdef CONSOLE
-      /* In the console version of Find_Orb,  the following two functions */
-      /* get remapped to Curses functions.  In the non-interactive one,   */
-      /* they're mapped to 'do-nothings'.  See fo.cpp & find_orb.cpp.     */
-   void refresh_console( void);
-   void move_add_nstr( const int col, const int row, const char *msg, const int n_bytes);
-#endif
-
-#ifdef CONSOLE
-#define COLOR_DEFAULT_INQUIRY       9
-int inquire( const char *prompt, char *buff, const int max_len,
-                     const int color);
-#endif
-
 int set_tholen_style_sigmas( OBSERVE *obs, const char *buff)
 {
    const int n_scanned = sscanf( buff, "%lf%lf%lf",
@@ -428,18 +425,9 @@ int set_tholen_style_sigmas( OBSERVE *obs, const char *buff)
 
 int generic_message_box( const char *message, const char *box_type)
 {
-   int rval;
-
-#ifdef CONSOLE
-   INTENTIONALLY_UNUSED_PARAMETER( box_type);
-   rval = inquire( message, NULL, 30, COLOR_DEFAULT_INQUIRY);
-#else
-   int box_flags = MB_YESNO;
+   int rval, color = (*box_type == '!' ? COLOR_ATTENTION : COLOR_DEFAULT_INQUIRY);
 
-   if( !strcmp( box_type, "o"))
-      box_flags = MB_OK;
-   rval = MessageBox( NULL, message, "Find_Orb", box_flags);
-#endif
+   rval = inquire( message, NULL, 30, color);
    debug_printf( "%s", message);
    return( rval);
 }
@@ -494,7 +482,7 @@ static inline int get_lat_lon_from_header( double *lat,
          warning_shown = true;      /* just do this once */
          snprintf_err( tbuff, sizeof( tbuff),   /* see efindorb.txt */
                   get_find_orb_text( 2000), mpc_code);
-         generic_message_box( tbuff, "o");
+         generic_message_box( tbuff, "!");
          }
       else if( !rval)
          {
@@ -541,7 +529,10 @@ static int extract_mpc_station_data( const char *buff, mpc_code_t *cinfo)
              cinfo->lon -= PI + PI;
          }
       else
+         {
          memset( cinfo, 0, sizeof( mpc_code_t));
+         cinfo->planet = rval;
+         }
       }
    return( rval);
 }
@@ -646,18 +637,12 @@ char *mpc_station_name( char *station_data)
    return( station_data + (station_data[4] == '!' ? 47 : 30));
 }
 
-static int mpc_code_cmp( const char *ptr1, const char *ptr2)
+static int mpc_code_cmp( const void *ptr1, const void *ptr2)
 {
-   int rval = memcmp( ptr1, ptr2, 3);
+   const char **p1 = (const char **)ptr1;
+   const char **p2 = (const char **)ptr2;
 
-   if( !rval)
-      {
-      const char c1 = (ptr1[3] == ' ' ? '\0' : ptr1[3]);
-      const char c2 = (ptr2[3] == ' ' ? '\0' : ptr2[3]);
-
-      rval = c1 - c2;
-      }
-   return( rval);
+   return( memcmp( *p1, *p2, 4));
 }
 
 /* The first (247) roving observer retains that code.  If another
@@ -733,7 +718,7 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
    size_t i;
    const char *override_observatory_name = NULL;
    double lat0 = 0., lon0 = 0., alt0 = 0.;
-   char temp_code[4];
+   char temp_code[5];
    const size_t buffsize = 81;
 
    if( !mpc_code)    /* freeing up resources */
@@ -746,13 +731,6 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
       return( 0);
       }
 
-   if( strlen( mpc_code) > 6 && mpc_code[3] == '-')
-      {        /* CSS-style extended codes,  such as 807-100 or 807-061a */
-      memcpy( temp_code, mpc_code, 3);
-      temp_code[3] = '\0';
-      mpc_code = temp_code;
-      }
-
    if( !n_stations)
       {
       int sort_column = 0;
@@ -769,6 +747,23 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
                station_data[i] = station_data[i - 1];
             }
       }
+   if( !memcmp( mpc_code, "@90", 3))      /* looking for dynamical point info */
+      {
+      for( i = 1; i < (size_t)n_stations; i++)
+         if( !memcmp( station_data[i] + 41, mpc_code, 5))
+            {
+            strcpy( buff, station_data[i]);
+            return( 0);
+            }
+      assert( 0);          /* should never get here */
+      return( -1);
+      }
+
+   memcpy( temp_code, mpc_code, 4);
+   if( 4 != strlen( mpc_code))
+      temp_code[3] = ' ';
+   temp_code[4] = '\0';
+
    if( !cinfo)   /* attempting to look up an MPC code from the station name */
       {
       int pass;
@@ -778,19 +773,20 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
             if( (!pass && !memcmp( buff, station_data[i] + 30, strlen( buff)))
                      || (pass && strstr( station_data[i] + 30, buff)))
                {
-               strlcpy_err( buff, station_data[i], buffsize);
+               strlcpy( buff, station_data[i], buffsize);
                return( 0);
                }
       return( -1);
       }
+   memset( cinfo, 0, sizeof( mpc_code_t));
+   cinfo->planet = 3;         /* default to geocentric */
 
-
-   if( !get_lat_lon_from_header( &lat0, &lon0, &alt0, mpc_code,
+   if( !get_lat_lon_from_header( &lat0, &lon0, &alt0, temp_code,
                                              &override_observatory_name))
       if( !override_observatory_name)
          override_observatory_name = "Temporary MPC code";
 
-   rover_idx = get_rover_index( mpc_code);
+   rover_idx = get_rover_index( temp_code);
    if( rover_idx >= 0)
       {
       if( rover_idx < n_rovers)
@@ -802,43 +798,13 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
       override_observatory_name = "Roving observer";
       }
 
-   if( strchr( "nsew", tolower( mpc_code[0])))
+   if( !get_lat_lon_info( cinfo, mpc_code))
       {
-      int got_em = 0;
-      size_t j;
-
-      for( i = 0; mpc_code[i]; i++)
-         {
-         const int c = tolower( mpc_code[i]);
-
-         j = i + 1;
-         while( mpc_code[j] == ' ')
-            j++;
-         if( !strncasecmp( mpc_code + i, "alt", 3))
-            alt0 = atof( mpc_code + i + 3);
-         if( isdigit( mpc_code[j]))
-            {
-            if( c == 'n' || c == 's')
-               {
-               lat0 = atof( mpc_code + i + 1);
-               if( c == 's')
-                  lat0 = -lat0;
-               got_em ^= 1;
-               }
-            if( c == 'e' || c == 'w')
-               {
-               lon0 = atof( mpc_code + i + 1);
-               if( c == 'w')
-                  lon0 = -lon0;
-               got_em ^= 2;
-               }
-            }
-         }
-      if( got_em == 3)
-         {
-         mpc_code = "zzzz";
-         override_observatory_name = "User-supplied observer";
-         }
+      mpc_code = "zzzz";
+      lat0 = cinfo->lat * 180. / PI;
+      lon0 = cinfo->lon * 180. / PI;
+      alt0 = cinfo->alt;
+      override_observatory_name = "User-supplied observer";
       }
 
    if( override_observatory_name)
@@ -865,25 +831,39 @@ int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo)
       return( rval);
       }
 
-   if( !curr_station || mpc_code_cmp( curr_station, mpc_code))
+   mpc_code = temp_code;
+   if( !curr_station || mpc_code_cmp( &curr_station, &mpc_code))
       {
-      int step, loc = -1, loc1;
+      char **search = (char **)bsearch_ext( &mpc_code, station_data, n_stations,
+                  sizeof( char *), mpc_code_cmp, NULL);
 
-      curr_station = NULL;
-      for( step = 0x8000; step; step >>= 1)
-         if( (loc1 = loc + step) < n_stations)
-            {
-            const int compare = mpc_code_cmp( station_data[loc1], mpc_code);
-
-            if( compare <= 0)
-               loc = loc1;
-            if( !compare)
-               curr_station = station_data[loc];
-            }
+      curr_station = (search ? *search : NULL);
       }
    if( !curr_station)
       {
+      const char *envar = "UPDATE_OBSCODES_HTML";
+      const double curr_t = current_jd( );
+      double last_t = 0., delay = 0.1;
+
+      sscanf( get_environment_ptr( envar), "%lf %lf", &last_t, &delay);
       debug_printf( "Couldn't find MPC station '%s'\n", mpc_code);
+      debug_printf( "Curr t %f; last t %f; delay %f\n",
+                  curr_t, last_t, delay);
+      if( curr_t > last_t + delay && isalnum( mpc_code[0])
+                                  && isdigit( mpc_code[1]) && isdigit( mpc_code[2]))
+         {
+         char path[PATH_MAX];
+
+         snprintf( path, sizeof( path), "%f %f", curr_t, delay);
+         set_environment_ptr( envar, path);
+         make_config_dir_name( path, "ObsCodes.htm");
+         if( !download_a_file( path,
+                  "http://www.minorplanetcenter.org/iau/lists/ObsCodes.html"))
+            {
+            get_observer_data( NULL, NULL, NULL);
+            return( get_observer_data( mpc_code, buff, cinfo));
+            }
+         }
       if( buff)
          {
          strcpy( buff, blank_line);
@@ -919,94 +899,6 @@ static int get_observer_data_latlon( const char FAR *mpc_code,
    return( rval);
 }
 
-/*   The offset between a satellite observation and the earth or sun    */
-/* is stored in a second line,  as described at                         */
-/* https://www.minorplanetcenter.net/iau/info/SatelliteObs.html         */
-/*    This format allows parallax type '1' in kilometers or type '2'    */
-/* in AU.  If the input file contains the line '#relax_xyz',  Find_Orb  */
-/* is less picky about where decimal points and +/- signs appear.       */
-/* (It used to insist that the field be "filled out" with digits,  but  */
-/* at least some records contain lower precision positions.  Thus far,  */
-/* the ones I've seen still had enough digits to match the precision of */
-/* the instrument,  so I'm letting "short" records slide if they're     */
-/* only lacking three or fewer places.)                                 */
-
-#define SATELL_COORD_BAD_SIGN       -1
-#define SATELL_COORD_BAD_NUMBER     -2
-#define SATELL_COORD_NO_DECIMAL     -3
-
-static bool strict_sat_xyz_format = true;
-
-inline double get_satellite_coordinate( const char *iptr, int *decimal_loc)
-{
-   char tbuff[12];
-   const char sign_byte = *iptr;
-   double rval = 0.;
-
-   memcpy( tbuff, iptr, 11);
-   tbuff[11] = '\0';
-   if( !strict_sat_xyz_format)
-      {
-      rval = atof( tbuff + 1);
-      if( sign_byte == '-')
-         rval = -rval;
-      *decimal_loc = 0;
-      }
-   else if( sign_byte != '+' && sign_byte != '-')
-      *decimal_loc = -1;         /* signal bad sign */
-   else
-      {
-      char *tptr;
-      int n_bytes_read;
-
-      if( sscanf( tbuff + 1, "%lf%n", &rval, &n_bytes_read) != 1
-                     || n_bytes_read < 7)
-         *decimal_loc = -2;
-      else if( (tptr = strchr( tbuff, '.')) == NULL)
-         *decimal_loc = -3;
-      else
-         *decimal_loc = (int)( tptr - tbuff);
-      if( sign_byte == '-')
-         rval = -rval;
-      if( *decimal_loc <= 0)
-         debug_printf( "decimal loc %d: '%s', n_bytes_read %d\n", *decimal_loc,
-                           tbuff, n_bytes_read);
-      }
-   return( rval);
-}
-
-int get_satellite_offset( const char *iline, double *xyz)
-{
-   unsigned i;
-   int error_code = 0, decimal_loc;
-   const int observation_units = (int)iline[32] - '0';
-
-   for( i = 0; i < 3; i++)    /* in case of error,  use 0 offsets */
-      xyz[i] = 0.;
-   iline += 34;      /* this is where the offsets start */
-   for( i = 0; !error_code && i < 3; i++, iline += 12)
-      {
-      xyz[i] = get_satellite_coordinate( iline, &decimal_loc);
-      if( observation_units == 1)         /* offset given in km */
-         {
-         xyz[i] /= AU_IN_KM;
-         if( strict_sat_xyz_format)    /* offset must be < 10 million km */
-            if( decimal_loc < 6 || decimal_loc > 8)
-               error_code = -1;
-         }
-      else if( observation_units == 2)          /* offset in AU */
-         {                         /* offset must be less than 100 AU */
-         if( strict_sat_xyz_format && decimal_loc != 2 && decimal_loc != 3)
-            error_code = -2;
-         }
-      else      /* don't know about this sort of offset */
-         error_code = -3;
-      if( !error_code && xyz[i] == 0.)
-         error_code = -4;
-      }
-   equatorial_to_ecliptic( xyz);
-   return( error_code);
-}
 
 /* Used in part for sanity checks ("is the observed RA/dec above the
    horizon?  Is the sun _below_ the horizon at that time?")  Either
@@ -1026,7 +918,7 @@ static int get_obs_alt_azzes( const OBSERVE FAR *obs, DPT *sun_alt_az,
    int rval = (get_observer_data_latlon( obs->mpc_code, NULL,
                                     &latlon.x, &latlon.y, NULL) != 3);
 
-   if( !memcmp( obs->mpc_code, "500", 3))
+   if( !latlon.x && !latlon.y)
       rval = -1;
    if( !rval)
       {
@@ -1150,7 +1042,7 @@ static void try_adding_comet_name( const char *search, char *name)
                {
                buff[44] = '\0';
                remove_trailing_cr_lf( buff);
-               strcat( name, " ");
+               strcat( name, strchr( name, '/') ? " " : "/");
                strcat( name, buff + slen);
                }
             }
@@ -1182,7 +1074,7 @@ char *find_numbered_mp_info( const int number)
    const int tolerance = 10;        /* try to get within ten lines */
    static int cached_number = -1;
    static char *cached = NULL;
-   char buff[200];
+   char buff[200], *name_text;
    FILE *ifile;
 
    if( !number)
@@ -1196,11 +1088,13 @@ char *find_numbered_mp_info( const int number)
    if( cached_number == -2)      /* haven't got the file */
       return( NULL);
    ifile = fopen_ext( "NumberedMPs.txt", "crb");
-   if( !ifile)
+   if( !ifile || !fgets( buff, sizeof( buff), ifile))
       {
       cached_number = -2;
       return( NULL);
       }
+   name_text = strstr( buff, "Ceres");
+   assert( name_text);
    while( !got_it)
       {
       if( number < tolerance)
@@ -1209,7 +1103,7 @@ char *find_numbered_mp_info( const int number)
          {
          fseek( ifile, loc, SEEK_SET);
          for( i = 0; i < 2; i++)
-            if( !fgets( buff, sizeof( buff), ifile))
+            if( !fgets_trimmed( buff, sizeof( buff), ifile))
                {
                fclose( ifile);
                return( NULL);
@@ -1222,7 +1116,7 @@ char *find_numbered_mp_info( const int number)
       if( curr_no > number - tolerance && curr_no <= number)
          {
          for( i = number - curr_no; i; i--)
-            if( !fgets( buff, 200, ifile))
+            if( !fgets_trimmed( buff, 200, ifile))
                {
                fclose( ifile);
                return( NULL);
@@ -1235,28 +1129,33 @@ char *find_numbered_mp_info( const int number)
    fclose( ifile);
    if( !cached)
       cached = (char *)malloc( 200);
+   if( name_text < buff + 12)       /* old 'NumberedMPs.txt' files put the */
+      {                            /* asteroid names in a different column */
+      memmove( buff + 12, name_text, strlen( name_text) + 1);
+      memset( name_text, ' ', (buff + 12) - name_text);
+      }
    strlcpy_err( cached, buff, 200);
    cached_number = number;
    return( cached);
 }
 
 /* An object with a name such as 1989-013A is probably an artsat,  and
-probably has a NORAD designation,  name,  and other info in 'satcat.txt',
+probably has a NORAD designation,  name,  and other info in 'satcat.html',
 a master list of artsats available at
 
-http://planet4589.org/space/log/satcat.txt
+https://planet4589.org/space/gcat/data/cat/satcat.html
 
    The following code can turn,  for example,  '1966-092A' into
 '1966-092A = NORAD 02501 = Molniya-1'.       */
 
 static bool try_artsat_xdesig( char *name)
 {
-   FILE *ifile = fopen_ext( "satcat.txt", "crb");
+   FILE *ifile = fopen_ext( "satcat.html", "crb");
    bool found_a_match = false;
 
    if( ifile)
       {
-      char tbuff[250];
+      char tbuff[500];
       size_t slen;
       size_t max_out = 80;    /* max len of 'name' will be 80 bytes */
 
@@ -1268,14 +1167,27 @@ static bool try_artsat_xdesig( char *name)
       remove_trailing_cr_lf( name);
       slen = strlen( name);
       if( max_out > slen)
+         {
+         char *name_ptr = NULL, *norad_num_ptr = NULL, *intl_desig_ptr = NULL;
+
+         strcpy( tbuff, "     ");
+         while( memcmp( tbuff, "JCAT ", 5) && fgets( tbuff, sizeof( tbuff), ifile))
+            ;
+         norad_num_ptr = strstr( tbuff, "Satca");
+         assert( norad_num_ptr);
+         intl_desig_ptr = strstr( tbuff, "Piece");
+         assert( intl_desig_ptr);
+         name_ptr = strstr( tbuff, "Name ");
+         assert( name_ptr);
          while( !found_a_match && fgets( tbuff, sizeof( tbuff), ifile))
-            if( !memcmp( tbuff + 8, name, slen) && tbuff[slen + 8] == ' ')
+            if( !memcmp( intl_desig_ptr, name, slen) && intl_desig_ptr[slen] == ' ')
                {
                found_a_match = true;
-               snprintf_append( name, max_out - slen, " = NORAD %.5s = %.31s",
-                        tbuff + 2, tbuff + 23);
+               snprintf_append( name, max_out - slen, " = NORAD %.5s = %.28s",
+                        norad_num_ptr, name_ptr);
                remove_trailing_cr_lf( name);
                }
+         }
       fclose( ifile);
       }
    return( found_a_match);
@@ -1401,7 +1313,7 @@ int get_object_name( char *obuff, const char *packed_desig)
          try_artsat_xdesig( obuff);
       if( rval == OBJ_DESIG_COMET_NUMBERED)
          {
-         snprintf_err( xdesig, sizeof( xdesig), "%3d%c/", atoi( obuff + 2), *obuff);
+         snprintf_err( xdesig, sizeof( xdesig), "%3d%c/", atoi( obuff), xdesig[4]);
          try_adding_comet_name( xdesig, obuff);
          }
       if( rval == OBJ_DESIG_COMET_PROVISIONAL)
@@ -1411,15 +1323,37 @@ int get_object_name( char *obuff, const char *packed_desig)
          }
       if( rval == OBJ_DESIG_ASTEROID_NUMBERED)
          {
-         char *info = find_numbered_mp_info( atoi( obuff + 1));
+         const int number = atoi( obuff + 1);
+         char *info = find_numbered_mp_info( number);
 
+         snprintf_err( obuff, 11, "(%d)", number);
          obuff += strlen( obuff);
          if( info)
             {
-            if( info[9] != ' ')              /* append name */
-               strlcpy( obuff, info + 8, 19);
-            else if( info[29] != ' ')        /* prov ID */
-               strlcpy( obuff, info + 28, 12);
+            if( info[33] != ' ')        /* prov ID */
+               {
+               strlcpy( obuff, " =", 3);
+               strlcpy( obuff + 2, info + 31, 12);
+               remove_trailing_cr_lf( obuff);
+               }
+            if( info[12] != ' ')             /* append name */
+               {
+               FILE *ifile = fopen_ext( "astnames.txt", "crb");
+               int n_read = 0;
+               char buff[200];
+
+               if( ifile)
+                  {
+                  while( fgets( buff, sizeof( buff), ifile) && memcmp( buff, "Ref N", 5))
+                     ;
+                  while( n_read < number && fgets_trimmed( buff, sizeof( buff), ifile))
+                     if( (n_read = atoi( buff + 10)) == number)
+                        strlcpy( obuff + strlen( obuff), buff + 17, 30);
+                  fclose( ifile);
+                  }
+               if( n_read != number)
+                  strlcpy( obuff + strlen( obuff), info + 11, 19);
+               }
             remove_trailing_cr_lf( obuff);
             }
          }
@@ -1439,8 +1373,6 @@ void set_obs_vect( OBSERVE FAR *obs)
    the following code computes that planet's J2000 equatorial coordinates
    using the PS1996 theory (or,  for the moon,  ELP82). */
 
-const char *get_environment_ptr( const char *env_ptr);     /* mpc_obs.cpp */
-void set_environment_ptr( const char *env_ptr, const char *new_value);
 int load_environment_file( const char *filename);          /* mpc_obs.cpp */
 static int load_default_environment_file( void);           /* mpc_obs.cpp */
 void update_environ_dot_dat( void);                        /* mpc_obs.cpp */
@@ -1448,25 +1380,12 @@ void update_environ_dot_dat( void);                        /* mpc_obs.cpp */
 static int earth_lunar_posn_vel( const double jd, double FAR *earth_loc,
                              double FAR *lunar_loc, const int is_vel)
 {
-   double t_earth[3], t_lunar[3];
-   int i;
-
-   planet_posn( 3 + (is_vel ? PLANET_POSN_VELOCITY_OFFSET : 0), jd, t_earth);
-   planet_posn( 10 + (is_vel ? PLANET_POSN_VELOCITY_OFFSET : 0), jd, t_lunar);
-                     /* earth_loc is the E-M barycenter,  and lunar_loc */
-                     /* is geocentric.  Modify earth_loc to be the earth */
-                     /* geocenter loc,  and lunar_loc to be heliocentric: */
-   for( i = 0; i < 3; i++)
-      {
-      const double earth_moon_barycenter_factor = 82.300679;
+   const int vel_offset = (is_vel ? PLANET_POSN_VELOCITY_OFFSET : 0);
 
-      t_earth[i] -= t_lunar[i] / earth_moon_barycenter_factor;
-      t_lunar[i] += t_earth[i];
-      if( earth_loc)
-         earth_loc[i] = t_earth[i];
-      if( lunar_loc)
-         lunar_loc[i] = t_lunar[i];
-      }
+   if( earth_loc)
+      planet_posn( PLANET_POSN_EARTH + vel_offset, jd, earth_loc);
+   if( lunar_loc)
+      planet_posn( PLANET_POSN_MOON  + vel_offset, jd, lunar_loc);
    return( 0);
 }
 
@@ -1491,15 +1410,17 @@ static inline int compute_topocentric_offset( const double ut,
                double *offset, double *vel)
 {
    double precess_matrix[9];
+   const double omega = planet_rotation_rate( planet_no, 0) * PI / 180.;
+                   /* planet rotation rate,  in radians/day */
    int i;
 
+   if( !omega)
+      generic_message_box( "'cospar.txt' not found!", "!");
+   assert( omega);
    calc_planet_orientation( planet_no, 0, ut, precess_matrix);
    spin_matrix( precess_matrix, precess_matrix + 3, lon);
    for( i = 0; i < 3; i++)
       {
-      const double omega = 2. * PI * 360.9856235 / 360.;
-                   /* earth's rotation rate,  in radians/day */
-
       if( offset)
          offset[i] = (rho_cos_phi * precess_matrix[i]
                     + rho_sin_phi * precess_matrix[i + 6]);
@@ -1550,39 +1471,31 @@ static int _compute_lagrange_point( double *vect, const int point_number,
 {
    static double state[6], cached_jde;
    static double multiplier;
-   static int cached_point_number;
+   static int cached_point_number = -1, obj1 = 0, obj2 = 0;
    int i;
 
-   if( cached_point_number != point_number || cached_jde != jde)
+   if( cached_point_number != point_number)
       {
-      int obj1 = (point_number / 10000) % 1000;
-      int obj2 = (point_number / 10) % 1000;
-      const int lpoint = point_number % 10;
-      double state1[6], state2[6];
-
-      if( cached_point_number != point_number
-                     && lpoint >= 1 && lpoint <= 3)  /* collinear cases */
-         {
-         char buff[30];
-         const char *multipliers;
-
-         snprintf_err( buff, sizeof( buff), "LAGRANGE_%03d%03d", obj1, obj2);
-         multipliers = get_environment_ptr( buff);
-         if( *multipliers)
-            {
-            double mults[3];
+      char buff[100], mpc_code[7];
 
-            i = sscanf( multipliers, "%lf,%lf,%lf",
-                        mults, mults + 1, mults + 2);
-            assert( i == 3);
-            multiplier = mults[lpoint - 1];
-            }
-         }
+      snprintf_err( mpc_code, sizeof( mpc_code), "@%d", point_number);
+      get_observer_data( mpc_code, buff, NULL);
+      i = sscanf( buff + 5, "%d %d %lf", &obj1, &obj2, &multiplier);
+      assert( i == 3);
+      assert( obj1 >= 0 && obj1 <= 10);
+      assert( obj2 >= 0 && obj2 <= 10);
       if( obj1 == 3 && obj2 == 10)     /* Earth-Moon case */
          {
          obj1 = PLANET_POSN_EARTH;     /* see 'pl_cache.h' */
          obj2 = PLANET_POSN_MOON;
          }
+      cached_point_number = point_number;
+      }
+   if( cached_jde != jde)
+      {
+      const int lpoint = (point_number - 1) % 5 + 1;
+      double state1[6], state2[6];
+
       planet_posn( obj1, jde, state1);
       planet_posn( obj1 + PLANET_POSN_VELOCITY_OFFSET, jde, state1 + 3);
       planet_posn( obj2, jde, state2);
@@ -1600,7 +1513,6 @@ static int _compute_lagrange_point( double *vect, const int point_number,
          for( i = 0; i < 6; i++)
             state[i] = state1[i] + state2[i];
          }
-      cached_point_number = point_number;
       cached_jde = jde;
       }
    for( i = 0; i < 3; i++)
@@ -1616,7 +1528,7 @@ int compute_observer_loc( const double jde, const int planet_no,
    if( planet_no == -2)
       return( get_canned_object_posn_vel( offset, NULL, jde));
 
-   if( planet_no > 90000000)
+   if( planet_no > 9000)
       _compute_lagrange_point( offset, planet_no, jde, false);
    else if( planet_no != 3 && planet_no != 10)
       planet_posn( planet_no >= 0 ? planet_no : 12, jde, offset);
@@ -1631,6 +1543,7 @@ int compute_observer_loc( const double jde, const int planet_no,
       double geo_offset[3];
       int i;
 
+      assert( planet_no < 9000);
       compute_topocentric_offset( ut, planet_no, rho_cos_phi, rho_sin_phi,
                                         lon, geo_offset, NULL);
       equatorial_to_ecliptic( geo_offset);
@@ -1648,7 +1561,7 @@ int compute_observer_vel( const double jde, const int planet_no,
 
    if( planet_no == -2)    /* spacecraft-based observation */
       return( get_canned_object_posn_vel( NULL, vel, jde));
-   if( planet_no > 90000000)
+   if( planet_no > 9000)
       _compute_lagrange_point( vel, planet_no, jde, true);
    else if( planet_no != 3 && planet_no != 10)
       planet_posn( (planet_no >= 0 ? planet_no : 12) + PLANET_POSN_VELOCITY_OFFSET,
@@ -1678,6 +1591,7 @@ int compute_observer_vel( const double jde, const int planet_no,
 
 static double input_coordinate_epoch = 2000.;
 static double override_time = 0., override_ra = -100., override_dec = -100.;
+static double override_mag = -100.;
       /* 'override_time' allows one to set the observation time with the */
       /* #time keyword (see below) or with certain keywords.  Similarly  */
       /* for override_ra and override_dec,  primarily used for ADES  */
@@ -1746,7 +1660,7 @@ void set_up_observation( OBSERVE FAR *obs)
          else                     /* possible error messages.  */
             text_to_add = 2004;
          strlcat_err( tbuff, get_find_orb_text( text_to_add), sizeof( tbuff));
-         generic_message_box( tbuff, "o");
+         generic_message_box( tbuff, "!");
          comment_observation( obs, "? NoCode");
          obs->is_included = 0;
          obs->flags |= OBS_DONT_USE;
@@ -1794,6 +1708,8 @@ int object_type;
 int find_fcct_biases( const double ra, const double dec, const char catalog,
                  const double jd, double *bias_ra, double *bias_dec);
 
+#define valid_temp_desig_char( c)  (isalnum( c) || '-' == (c) || '_' == (c))
+
 static int parse_observation( OBSERVE FAR *obs, const char *buff)
 {
    unsigned time_format;
@@ -1815,6 +1731,29 @@ static int parse_observation( OBSERVE FAR *obs, const char *buff)
    obs->ref_center = saved_obs.ref_center;
    obs->packed_id[12] = '\0';
    obj_desig_type = get_object_name( NULL, obs->packed_id);
+   if( obj_desig_type == OBJ_DESIG_OTHER)
+      {
+      size_t i = 7;
+
+      while( i < 12 && valid_temp_desig_char( buff[i]))
+         i++;
+      while( i < 12 && buff[i] == ' ')
+         i++;
+      if( i != 12)
+         {
+         static bool warning_not_yet_shown = true;
+
+         if( warning_not_yet_shown)
+            {
+            char tbuff[300];
+
+            warning_not_yet_shown = false;
+            snprintf_err( tbuff, sizeof( tbuff), get_find_orb_text( 2074),
+                        obs->packed_id);
+            generic_message_box( tbuff, "!");
+            }
+         }
+      }
    if( obj_desig_type == OBJ_DESIG_COMET_PROVISIONAL
          || obj_desig_type == OBJ_DESIG_COMET_NUMBERED)
       object_type = OBJECT_TYPE_COMET;
@@ -1837,15 +1776,12 @@ static int parse_observation( OBSERVE FAR *obs, const char *buff)
    obs->note1 = buff[13];
    obs->note2 = buff[14];
    if( is_radar_obs || buff[14] == 's' || buff[14] == 'v')
-      {     /* radar data and "second lines" have no RA/dec: */
-      obs->ra = obs->dec = 0.;
-      obs->flags |= OBS_DONT_USE;
-      }
+      obs->ra = obs->dec = 0.;  /* radar data and "second lines" have no RA/dec */
    else
       {
       const int rval = get_ra_dec_from_mpc_report( buff,
-                  &obs->ra_precision, &obs->ra, &obs->posn_sigma_1,
-                  &obs->dec_precision, &obs->dec, &obs->posn_sigma_2);
+                  &obs->ra_precision, &obs->ra, &obs->posn_sigma_2,
+                  &obs->dec_precision, &obs->dec, &obs->posn_sigma_1);
 
       if( override_ra >= 0.)
          {
@@ -1857,6 +1793,12 @@ static int parse_observation( OBSERVE FAR *obs, const char *buff)
          obs->dec = override_dec * PI / 180.;
          override_dec = -100.;
          }
+#ifdef NOT_CURRENTLY_IN_USE
+      if( obs->ra_precision > 3)    /* indicates ADES format.  In ADES,  trailing */
+         obs->posn_sigma_2 = 0.;    /* zeroes are sometimes omitted.  So we can't */
+      if( obs->dec_precision > 3)   /* use precision as an uncertainty indicator, */
+         obs->posn_sigma_1 = 0.;    /* the way we can with 80-column data.        */
+#endif
       if( rval)
          return( rval);
       }
@@ -1930,7 +1872,16 @@ static int parse_observation( OBSERVE FAR *obs, const char *buff)
       }
    if( isdigit( buff[66]) && obs->note2 != 'R' &&
                (buff[67] == '.' || buff[67] == ' '))
+      {
       obs->obs_mag = atof( buff + 65);
+      if( override_mag >= -95.)
+         {
+         obs->obs_mag = override_mag;
+         override_mag = -100.;
+         }
+      if( obs->mag_band == ' ' && strstr( "249 C49 C50 PSP", obs->mpc_code))
+         obs->mag_band = 'V';   /* Sungrazer obs usually have a blank mag */
+      }                         /* band, but are basically V */
    else
       obs->obs_mag = BLANK_MAG;
    FMEMCPY( obs->reference, buff + 72, 5);
@@ -1942,7 +1893,7 @@ static int parse_observation( OBSERVE FAR *obs, const char *buff)
       {        /* i.e.,  we tried to get FCCT14 debiasing and failed */
       if( !fcct_error_message_shown && apply_debiasing)
          {
-         generic_message_box( get_find_orb_text( 2005), "o");
+         generic_message_box( get_find_orb_text( 2005), "!");
          fcct_error_message_shown = true;   /* see efindorb.txt */
          }
       }
@@ -2304,7 +2255,7 @@ static bool get_neocp_data( char *buff, char *desig, char *mpc_code)
       if( !already_warned)
          {                             /* warn about geocentric ephems */
          already_warned = 1;           /* see 'efindorb.txt' for details */
-         generic_message_box( get_find_orb_text( 2006), "o");
+         generic_message_box( get_find_orb_text( 2006), "!");
          }
       }
    else if( (tptr = strstr( buff, " observatory code ")) != NULL)
@@ -2330,7 +2281,6 @@ static bool get_neocp_data( char *buff, char *desig, char *mpc_code)
          obuff[80] = '\0';
          strcpy( obuff + 5, desig);
          memcpy( obuff + 15, buff, 10);     /* year, month, day */
-//       sprintf( obuff + 25, ".%05d", atoi( buff + 11) * 100000 / 24);
          if( mask == mask_if_hours)     /* ephem step size is in hours */
             minutes = atoi( buff + 11) * 60;
          else                       /* step size was in minutes */
@@ -2363,47 +2313,31 @@ static bool get_neocp_data( char *buff, char *desig, char *mpc_code)
 
 static void inline reformat_rwo_designation_to_mpc( const char *buff, char *obuff)
 {
-   if( !isalpha( buff[6]))           /* numbered object */
+   size_t i = 1;
+   char obj_name[10], packed[13];
+
+   assert( ' ' == buff[0]);
+   while( isdigit( buff[i]))
+      i++;
+   assert( i < 10);
+   if( buff[i] == ' ')           /* numbered object */
       {
-      const long ast_number = atoi( buff);
-      const long leading_digit = ast_number / 10000L;
 
-      *obuff = int_to_mutant_hex_char( leading_digit);
-      if( !*obuff)      /* mutant hex fails past asteroid 619999 */
-         *obuff = '?';  /* ...just put _something_ there         */
-      sprintf( obuff + 1, "%04ld", ast_number % 10000L);
-      obuff[5] = ' ';
+      snprintf_err( obj_name, sizeof( obj_name), "(%ld)", atol( buff));
+      create_mpc_packed_desig( packed, obj_name);
+      memcpy( obuff, packed, 6);
       }
    else                       /* provisional designation */
       {
-      obuff[5] = (char)( 'K' + (buff[1] - '2') * 10 + buff[2] - '0');
-                                    /* obuff[5] is century marker */
-      obuff[6] = buff[3];    /* decade */
-      obuff[7] = buff[4];    /* year */
-      obuff[8] = buff[5];    /* first letter */
-      obuff[11] = buff[6];    /* 2nd   letter */
-                  /* A provisional designation is a four-digit year, */
-                  /* plus two letters,  plus either no number,  or a */
-                  /* one, two,  or three-digit number. */
-      if( buff[7] == ' ')              /* No number: say,  '2004RW' */
-         obuff[9] = obuff[10] = '0';
-      else if( buff[8] == ' ')         /* One-digit #: say,  '2004RW1' */
-         {
-         obuff[9] = '0';
-         obuff[10] = buff[7];
-         }
-      else if( buff[9] == ' ')         /* 2-digit #: say,  '2004RW31' */
-         {
-         obuff[9] = buff[7];    /* 1st (tens) digit */
-         obuff[10] = buff[8];    /* 2nd (units) digit */
-         }
-      else                             /* 3-digit #: say,  '2004RW314' */
-         {
-         const int tens = buff[7] * 10 + buff[8] - '0' * 11;
-
-         obuff[9] = int_to_mutant_hex_char( tens);
-         obuff[10] = buff[9];    /* 3rd (units) digit */
-         }
+      assert( 5 == i);
+      assert( isalpha( buff[5]));
+      assert( isalpha( buff[6]));
+      while( buff[i] != ' ')
+         i++;
+      memcpy( obj_name, buff + 1, i - 1);
+      obj_name[i - 1] = '\0';
+      create_mpc_packed_desig( packed, obj_name);
+      memcpy( obuff, packed, 12);
       }
 }
 
@@ -2942,6 +2876,8 @@ static void correct_differences( OBSERVE *obs1, const OBSERVE *obs2)
       obs1->mag_band = obs2->mag_band;
    if( obs1->note1 == ' ' && obs2->note1 != ' ')
       obs1->note1 = obs2->note1;
+   if( obs1->discovery_asterisk == ' ' && obs2->discovery_asterisk == '*')
+      obs1->discovery_asterisk = '*';
 }
 
 /* For certain forms of orbit determination,  having radar observations right
@@ -2978,6 +2914,8 @@ int compare_observations( const void *a, const void *b, void *context)
       rval = 1;
    if( !rval)
       rval = obs1->note1 - obs2->note1;
+   if( !rval)
+      rval = strcmp( obs1->reference, obs2->reference);
    if( !rval && obs1->ra != obs2->ra)
       rval = (obs1->ra > obs2->ra ? 1 : -1);
    if( !rval && obs1->dec != obs2->dec)
@@ -2985,6 +2923,24 @@ int compare_observations( const void *a, const void *b, void *context)
    return( rval);
 }
 
+/* If two observations are within a threshhold of each other in time,
+they may be duplicates,  with one (say) recorded to five places and
+the other to six.  Or one in decimal days (80-column format) and
+the other in seconds (ADES).
+
+The threshhold may depend on the type of observation.  Video,  for
+example,  may provide a slew of observations within 1/30 second of
+each other.  Such nuances aren't currently implemented,  but they
+are why pointers to the full observation data are passed,  instead
+of just the observed times. */
+
+static bool times_very_close( OBSERVE *obs1, OBSERVE *obs2)
+{
+   const double threshhold = 3. / seconds_per_day;
+
+   return( fabs( obs1->jd - obs2->jd) < threshhold);
+}
+
 /* If we have duplicate observations,  but their RA/decs are within
 (say) two arcseconds,  they may plausibly work for initial orbit
 determination.  Otherwise,  they'll probably just throw off IOD
@@ -3001,7 +2957,7 @@ static void exclude_unusable_duplicate_obs( OBSERVE *obs, int n_obs)
       int j;
 
       i = 1;
-      while( i < n_obs && obs[i].jd == obs->jd
+      while( i < n_obs && times_very_close( obs, obs + i)
                         && !strcmp( obs[i].mpc_code, obs->mpc_code))
          {
          const double d_ra = centralize_ang( obs[i].ra - obs->ra);
@@ -3031,7 +2987,7 @@ static void exclude_unusable_duplicate_obs( OBSERVE *obs, int n_obs)
 /* Does what the function name suggests.  Return value is the number
 of observations left after duplicates have been removed.   */
 
-int sort_obs_by_date_and_remove_duplicates( OBSERVE *obs, const int n_obs)
+static int sort_obs_by_date_and_remove_duplicates( OBSERVE *obs, const int n_obs)
 {
    int i, j;
 
@@ -3041,8 +2997,9 @@ int sort_obs_by_date_and_remove_duplicates( OBSERVE *obs, const int n_obs)
    if( debug_level)
       debug_printf( "%d obs sorted by date\n", n_obs);
    for( i = j = 1; i < n_obs; i++)
-      if( obs[i].jd != obs[i - 1].jd || strcmp( obs[i].mpc_code,
-                                                obs[i - 1].mpc_code))
+      if( !times_very_close( obs + i, obs + i - 1)
+                      || strcmp( obs[i].mpc_code, obs[i - 1].mpc_code)
+                      || (obs[i].flags & OBS_DONT_USE))
          obs[j++] = obs[i];
       else if( memcmp( obs + i, obs + i - 1, sizeof( OBSERVE)))
          {
@@ -3169,6 +3126,12 @@ int unload_observations( OBSERVE FAR *obs, const int n_obs)
       destroy_stack( _ades_ids_stack);
       _ades_ids_stack = NULL;
       }
+   if( rovers)
+      {
+      free( rovers);
+      rovers = NULL;
+      n_rovers = 0;
+      }
    available_sigmas = NO_SIGMAS_AVAILABLE;
    return( 0);
 }
@@ -3386,7 +3349,7 @@ static inline void check_for_star( const OBSERVE *obs, const int n_obs)
          max_dec = obs[i].dec;
       }
    if( max_ra - min_ra < tolerance && max_dec - min_dec < tolerance)
-      generic_message_box( get_find_orb_text( 2001), "o");
+      generic_message_box( get_find_orb_text( 2001), "!");
 }
 
 /* ADES sigmas are converted into a punched-card compatible format such as
@@ -3400,11 +3363,11 @@ have to be given. */
 
 static inline int extract_ades_sigmas( const char *buff,
          double *posn1, double *posn2, double *theta,
-         double *mag_sigma, double *time_sigma)
+         double *mag_sigma, double *time_sigma, double *unc_time)
 {
    int loc, rval = -1;
 
-   if( sscanf( buff, "%lf%n", posn1, &loc) == 1)
+   if( sscanf( buff, "%lf%n", posn2, &loc) == 1)
       {
       const char *tptr;
 
@@ -3412,7 +3375,7 @@ static inline int extract_ades_sigmas( const char *buff,
       *theta = 0.;
       if( buff[loc] == 'x')
          {
-         *posn2 = atof( buff + loc + 1);
+         *posn1 = atof( buff + loc + 1);
          while( buff[loc] > ' ' && buff[loc] != ',')
             loc++;
          if( buff[loc] == ',')
@@ -3421,17 +3384,19 @@ static inline int extract_ades_sigmas( const char *buff,
 
             convert_ades_sigmas_to_error_ellipse( *posn1, *posn2,
                               correlation, posn1, posn2, theta);
-            *theta = PI / 2. + *theta;
             }
          }
       else        /* circular position error */
-         *posn2 = *posn1;
+         *posn1 = *posn2;
       tptr = strstr( buff + loc, "m:");
       if( tptr)
          *mag_sigma = atof( tptr + 2);
       tptr = strstr( buff + loc, "t:");
       if( tptr)
          *time_sigma = atof( tptr + 2) / seconds_per_day;
+      tptr = strstr( buff + loc, "u:");
+      if( tptr)
+         *unc_time   = atof( tptr + 2) / seconds_per_day;
       }
    if( rval)
       debug_printf( "Malformed ADES sigma: '%s'\n", buff);
@@ -3458,15 +3423,10 @@ static void reset_object_type( const OBSERVE *obs, const int n_obs)
          }
    if( n_total + n_nuclear > n_asteroid)
       object_type = OBJECT_TYPE_COMET;
+   else if( is_sungrazing_comet( obs, n_obs))
+      object_type = OBJECT_TYPE_COMET;
    else if( n_asteroid)
       object_type = OBJECT_TYPE_ASTEROID;
-                 /* if all observations are from SOHO and STEREO-A & B, */
-                 /* the object is almost certainly a comet */
-   i = 0;
-   while( i < n_obs && strstr( "249 C49 C50", obs[i].mpc_code))
-      i++;
-   if( i == n_obs)
-      object_type = OBJECT_TYPE_COMET;
    if( object_type == OBJECT_TYPE_COMET)
       {
       extern char default_comet_magnitude_type;
@@ -3488,23 +3448,6 @@ bool nighttime_only( const char *mpc_code)
 #define INSUFFICIENT_PRECISION_POSN1    4
 #define INSUFFICIENT_PRECISION_POSN2    8
 
-static void warn_about_insufficient_precision( const OBSERVE *obs, const int flags)
-{
-   char buff[90], msg[500];
-   const char *quantity;
-
-   full_ctime( buff, utc_from_td( obs->jd, NULL), FULL_CTIME_YMD);
-   if( flags & INSUFFICIENT_PRECISION_MAG)
-      quantity = "magnitude";
-   else if( flags & INSUFFICIENT_PRECISION_MAG)
-      quantity = "time";
-   else
-      quantity = "RA/dec";
-   snprintf_err( msg, sizeof( msg), get_find_orb_text( 2072),
-             buff, obs->mpc_code, quantity);
-   generic_message_box( msg, "o");
-}
-
 static bool _is_synthetic_obs( const OBSERVE *obs)
 {
    return( !strcmp( obs->reference, "Synth")
@@ -3535,6 +3478,12 @@ single_observation_posn_sigma_1 looked too long to me.     */
    /* adjusted in 'environ.dat'.                                  */
 double maximum_observation_span = 200.;
 
+   /* The longest ADES line I've seen was about 570 bytes.  2000 bytes  */
+   /* ought to be enough for anyone.  (I may add error checks/warnings  */
+   /* here,  though.)                                                   */
+
+#define MAX_ADES_LINE_LEN 2000
+
 int sanity_check_observations = 1;
 bool use_sigmas = true;
 extern int is_interstellar;
@@ -3544,14 +3493,13 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                            const int n_obs)
 {
    const double days_per_year = 365.25;
-   char buff[650], mpc_code_from_neocp[4], desig_from_neocp[15];
+   char buff[MAX_ADES_LINE_LEN], mpc_code_from_neocp[4], desig_from_neocp[15];
    char obj_name[80], curr_ades_ids[100];
    OBSERVE FAR *rval;
    bool including_obs = true;
    int i, n_fixes_made = 0, n_future_obs = 0;
    unsigned line_no = 0;
    unsigned n_below_horizon = 0, n_in_sunlight = 0;
-   unsigned lines_actually_read = 0;
    unsigned n_spurious_matches = 0;
    unsigned n_sat_obs_without_offsets = 0;
    double override_posn_sigma_1 = 0., ades_posn_sigma_1 = 0.;  /* in arcsec */
@@ -3559,6 +3507,7 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
    double override_posn_sigma_theta = 0., ades_posn_sigma_theta = 0.;
    double override_mag_sigma = 0., ades_mag_sigma = 0.;   /* in mags */
    double override_time_sigma = 0., ades_time_sigma = 0.;  /* in seconds */
+   double unc_time = 0.;
             /* We distinguish between observations that are complete clones */
             /* of each other,  and those with the same time, RA/dec, MPC    */
             /* code, and magnitude,  but which differ someplace else.       */
@@ -3575,12 +3524,11 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
    int spacecraft_offset_reference = 399;    /* default is geocenter */
    double spacecraft_vel[3];
    static int suppress_private_obs = -1;
-   int insufficient_precision_warning_shown = 0;
+   int count_satellite_coord_errors[N_SATELL_COORD_ERRORS];
 
-#ifdef CONSOLE
+   memset( count_satellite_coord_errors, 0, sizeof( count_satellite_coord_errors));
    move_add_nstr( 1, 2, "Loading observations", -1);
    refresh_console( );
-#endif
    *desig_from_neocp = '\0';
    strcpy( mpc_code_from_neocp, "500");   /* default is geocenter */
    neocp_file_type = NEOCP_FILE_TYPE_UNKNOWN;
@@ -3617,7 +3565,6 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       double jd;
 
       line_no++;
-      lines_actually_read++;
       if( *buff == '<')
          remove_html_tags( buff);
       if( !strncmp( buff, "errmod  = 'fcct14'", 18))
@@ -3637,7 +3584,7 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
             debug_printf( "Got .rwo data\n");
          }
       if( fixing_trailing_and_leading_spaces)
-         fixes_made = fix_up_mpc_observation( buff);
+         fixes_made = fix_up_mpc_observation( buff, NULL);
       original_packed_desig[12] = '\0';
       memcpy( original_packed_desig, buff, 12);
       xref_designation( buff);
@@ -3665,7 +3612,10 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                if( buff[14] == 'R' && is_rwo)
                   strcpy( second_line, buff + 81);
                else if( !look_for_matching_line( buff, second_line, sizeof( second_line)))
+                  {
                   observation_is_good = false;
+                  jd = 0.;
+                  }
                if( observation_is_good)
                   {
                   rval[i].ref_center = spacecraft_offset_reference;
@@ -3678,14 +3628,20 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                double vect[3];
                int j, error_code;
 
-               lines_actually_read++;
                rval[i].satellite_obs = (char)(second_line[32] - '0');
                error_code = get_satellite_offset( second_line, vect);
+               assert( error_code <= 0 && error_code > -N_SATELL_COORD_ERRORS);
+               count_satellite_coord_errors[-error_code]++;
                if( error_code)
                   {
+                  char tbuff[6];
+
                   rval[i].flags |= OBS_DONT_USE;
                   rval[i].is_included = 0;
-                  comment_observation( rval + i, "?off");
+                  strcpy( tbuff, "?off ");
+                  tbuff[4] = (char)( '0' - error_code);
+                  tbuff[5] = '\0';
+                  comment_observation( rval + i, tbuff);
                   n_bad_satellite_offsets++;
                   debug_printf( "Error code %d; offending line was:\n%s\n",
                      error_code, second_line);
@@ -3704,7 +3660,6 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                }
             else if( buff[14] == 'R' && observation_is_good)
                {      /* we did find the "matching" line: */
-               lines_actually_read++;
 //             fix_radar_time( buff);
                rval[i].second_line = (char *)malloc( 81 * 2);
                strcpy( rval[i].second_line, second_line);
@@ -3719,7 +3674,6 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                const double dist_tol = 0.0003;  /* 3e-4 degrees = about 30 meters */
                int idx = 0;
 
-               lines_actually_read++;
                xref_designation( second_line);
                while( idx < n_rovers &&
                             (fabs( rlon - rovers[idx].lon) > dist_tol ||
@@ -3765,18 +3719,24 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                }
             if( rval[i].reference[0] == '!' && suppress_private_obs == -1)
                {
-               const int c = generic_message_box( get_find_orb_text( 2052), "o");
+               const char *suppression = get_environment_ptr( "PRIVATE_OBS");
 
-               if( c == 'y' || c == 'Y')     /* first time we see 'private' obs, */
-                  suppress_private_obs = 0;  /* ask if user wants them included */
+               if( *suppression)
+                  suppress_private_obs = atoi( suppression);
                else
-                  suppress_private_obs = 1;
+                  {
+                  const int c = generic_message_box( get_find_orb_text( 2052), "o");
+
+                  if( c == 'y' || c == 'Y')     /* first time we see 'private' obs, */
+                     suppress_private_obs = 0;  /* ask if user wants them included */
+                  else
+                     suppress_private_obs = 1;
+                  }
                }
             if( rval[i].reference[0] == '!' && suppress_private_obs)
                observation_is_good = false;
             if( observation_is_good)
                {
-               int insufficient_precision = 0;
                const double radians_per_arcsec = PI / (180. * 3600.);
                double mag_sigma = 0., time_sigma = 0.;
                double posn_sigma_1, posn_sigma_2;
@@ -3802,9 +3762,18 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
 
                   SET_SIGMA( mag_sigma, ades_mag_sigma, override_mag_sigma);
                   SET_SIGMA( time_sigma, ades_time_sigma, override_time_sigma);
-                  SET_SIGMA( posn_sigma_1, ades_posn_sigma_1, override_posn_sigma_1);
-                  SET_SIGMA( posn_sigma_2, ades_posn_sigma_2, override_posn_sigma_2);
-                  SET_SIGMA( posn_sigma_theta, ades_posn_sigma_theta, override_posn_sigma_theta);
+                  if( ades_posn_sigma_1 > 0.)
+                     {
+                     posn_sigma_1 = ades_posn_sigma_1;
+                     posn_sigma_2 = ades_posn_sigma_2;
+                     posn_sigma_theta = ades_posn_sigma_theta;
+                     }
+                  else if( override_posn_sigma_1 > 0.)
+                     {
+                     posn_sigma_1 = override_posn_sigma_1;
+                     posn_sigma_2 = override_posn_sigma_2;
+                     posn_sigma_theta = override_posn_sigma_theta;
+                     }
 
                   if( sscanf( rval[i].columns_57_to_65, "%lf %lf%n",
                               &ra_sigma, &dec_sigma, &bytes_read) >= 2
@@ -3863,23 +3832,19 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
 //                insufficient_precision |= INSUFFICIENT_PRECISION_MAG;
                if( time_sigma * 1.1 > rval[i].time_sigma || !use_sigmas)
                   rval[i].time_sigma = time_sigma;
-               else
-                  insufficient_precision |= INSUFFICIENT_PRECISION_TIME;
+//             else if( rval[i].note2 != 'X')
+//                insufficient_precision |= INSUFFICIENT_PRECISION_TIME;
                if( posn_sigma_1 * 1.1 > rval[i].posn_sigma_1 || !use_sigmas)
                   rval[i].posn_sigma_1 = posn_sigma_1;
-               else
-                  insufficient_precision |= INSUFFICIENT_PRECISION_POSN1;
-               if( posn_sigma_2 * 1.1 > rval[i].posn_sigma_2 || !use_sigmas)
+//             else if( rval[i].note2 != 'X')
+//                insufficient_precision |= INSUFFICIENT_PRECISION_POSN1;
+               if( posn_sigma_2 * 1.1 > rval[i].posn_sigma_2 || !use_sigmas
+                                 || !posn_sigma_2)
                   rval[i].posn_sigma_2 = posn_sigma_2;
-               else
-                  insufficient_precision |= INSUFFICIENT_PRECISION_POSN2;
-               if( insufficient_precision && !insufficient_precision_warning_shown
-                           && use_sigmas)
-                  {
-                  warn_about_insufficient_precision( rval + i, insufficient_precision);
-                  insufficient_precision_warning_shown = 1;
-                  }
+//             else if( rval[i].note2 != 'X')
+//                insufficient_precision |= INSUFFICIENT_PRECISION_POSN2;
                rval[i].posn_sigma_theta = posn_sigma_theta;
+               rval[i].unc_time = unc_time;
                if( !including_obs)
                   rval[i].is_included = 0;
                if( apply_debiasing)
@@ -3911,13 +3876,13 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                }
             }
          }
-      if( is_in_range( jd))     /* Sigmas from ADES or Dave Tholen apply to only */
-         {                 /* one observation.  Zero 'em out after that use : */
+      if( jd > 1.)       /* Sigmas from ADES or Dave Tholen apply to only */
+         {              /* one observation.  Zero 'em out after that use : */
          ades_posn_sigma_1 = ades_posn_sigma_2 = ades_mag_sigma = 0.;
-         ades_posn_sigma_theta = ades_time_sigma = 0.;
+         ades_posn_sigma_theta = ades_time_sigma = unc_time = 0.;
          }
       override_time = 0.;
-      override_ra = override_dec = -100.;
+      override_ra = override_dec = override_mag = -100.;
       convert_com_to_pound_sign( buff);
                /* For backwards compatibility,  we'll handle both 'weight' */
                /* and 'sigma' keywords,  with the former considered to     */
@@ -3946,11 +3911,13 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                                     &override_dec, &override_time))
                override_time += J2000;
             }
+         else if( !memcmp( buff, "#full mag ", 9))
+            override_mag = atof( buff + 9);
          else if( !memcmp( buff, "#Sigmas ", 8))
             extract_ades_sigmas( buff + 8, &ades_posn_sigma_1,
                         &ades_posn_sigma_2,
                         &ades_posn_sigma_theta,
-                        &ades_mag_sigma, &ades_time_sigma);
+                        &ades_mag_sigma, &ades_time_sigma, &unc_time);
          else if( !memcmp( buff, "#Mag sigma ", 11))
             override_mag_sigma = atof( buff + 11);
          else if( !memcmp( buff, "#Time sigma ", 12))
@@ -3979,8 +3946,6 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
             including_obs = true;
          else if( !memcmp( buff, "#toffset", 7))
             observation_time_offset = atof( buff + 8) / seconds_per_day;
-         else if( !memcmp( buff, "#relax_xyz", 10))
-            strict_sat_xyz_format = false;
          else if( !memcmp( buff, "#interstellar", 12))
             is_interstellar = 1;
          else if( !memcmp( buff, "#time ", 6))
@@ -3995,9 +3960,9 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                ;     /* deliberately empty loop */
          else if( !memcmp( buff, "#Offset center ", 15))
             spacecraft_offset_reference = atoi( buff + 15);
-         else if( !memcmp( buff, "#Spacecraft vel ", 16))
+         else if( !memcmp( buff, "#vel (km/s) ", 12))
             {
-            int n_scanned = sscanf( buff + 16, "%lf %lf %lf", spacecraft_vel,
+            int n_scanned = sscanf( buff + 30, "%lf %lf %lf", spacecraft_vel,
                         spacecraft_vel + 1, spacecraft_vel + 2);
 
             assert( 3 == n_scanned);
@@ -4005,6 +3970,16 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
             }
          else if( !memcmp( buff, "#IDs ", 5))
             strlcpy_err( curr_ades_ids, buff + 5, sizeof( curr_ades_ids));
+         else if( !memcmp( buff, "#'getradar' version", 19))
+            {
+            int j = 0;  /* we're replacing/updating the radar observations */
+                        /* using JPL data.  So remove the old MPC radar. */
+            while( j < i)
+               if( rval[j].note2 == 'R')
+                  rval[j] = rval[--i];    /* remove the radar observation */
+               else
+                  j++;
+            }
          }
       }
    free_ades2mpc_context( ades_context);
@@ -4018,6 +3993,12 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
          rval[i].flags |= OBS_DONT_USE;
          rval[i].is_included = 0;
          }
+      else if( rval[i].posn_sigma_1 <= 0. || rval[i].posn_sigma_2 <= 0.)
+         {
+         comment_observation( rval + i, "BadSigm");
+         rval[i].flags |= OBS_DONT_USE;
+         rval[i].is_included = 0;
+         }
    for( i = n_obs_actually_loaded; i < n_obs; i++)
       rval[i].jd = 0.;
 
@@ -4029,10 +4010,11 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2007),
                      (rval[i - 1].jd - rval[0].jd) /  days_per_year,
                      maximum_observation_span);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       while( rval[i - 1].jd - rval[j].jd > maximum_observation_span * days_per_year)
          j++;
       i -= j;
+      n_obs_actually_loaded -= j;
       memmove( rval, rval + j, i * sizeof( OBSERVE));
       }
 
@@ -4042,26 +4024,29 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
    monte_carlo_object_count = 0;
    n_monte_carlo_impactors = 0;
    if( look_for_matching_line( NULL, buff, sizeof( buff)))
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
    if( n_fixes_made)
       {
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2028),
                      n_fixes_made);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    if( n_duplicate_obs_found)
       {
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2009),
                      n_duplicate_obs_found);
       debug_printf( "%s:\n", rval->packed_id);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    if( n_bad_satellite_offsets)
       {
-      debug_printf( "%u bad sat offsets\n", n_bad_satellite_offsets);
-      snprintf_err( buff, sizeof( buff), get_find_orb_text( 2010),
-                     n_bad_satellite_offsets);
-      generic_message_box( buff, "o");
+      *buff = '\0';
+      for( i = 0; i < N_SATELL_COORD_ERRORS; i++)
+         if( count_satellite_coord_errors[i])
+            snprintf_append( buff, sizeof( buff), get_find_orb_text( i + 2090),
+                                   count_satellite_coord_errors[i]);
+      strlcat_error( buff, get_find_orb_text( 2010));
+      generic_message_box( buff, "!");
       }
 
    if( n_parse_failures)
@@ -4069,7 +4054,7 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2011),
                      n_parse_failures);
       debug_printf( "%s:\n", rval->packed_id);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
 
    if( sanity_check_observations)
@@ -4112,10 +4097,10 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
                         n_in_sunlight);
       strlcat_error( buff, get_find_orb_text( 2014));
       debug_printf( "%s:\n", rval->packed_id);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    for( i = 1; i < n_obs_actually_loaded; i++)
-      if( rval[i].jd == rval[i - 1].jd && !strcmp( rval[i].mpc_code, rval[i - 1].mpc_code))
+      if( times_very_close( rval + i, rval + i - 1) && !strcmp( rval[i].mpc_code, rval[i - 1].mpc_code))
          if( toupper( rval[i].note2) != 'X' && toupper( rval[i - 1].note2) != 'X')
             if( !spacewatch_duplication( rval + i - 1))
                {
@@ -4135,14 +4120,14 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2015),
                n_spurious_matches);
       debug_printf( "%s:\n", rval->packed_id);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    if( n_almost_duplicates_found)
       {
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2016),
                n_almost_duplicates_found);
       debug_printf( "%s:\n", rval->packed_id);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    for( i = 0; i < n_obs_actually_loaded; i++)
       if( rval[i].flags & OBS_NO_OFFSET)
@@ -4152,7 +4137,7 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       {
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2017),
                         n_sat_obs_without_offsets);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
    i = n_obs_actually_loaded;
    while( i-- >= 0 && rval[i].jd > current_jd( ))
@@ -4162,7 +4147,7 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       {
       snprintf_err( buff, sizeof( buff), get_find_orb_text( 2018),
                      n_future_obs);
-      generic_message_box( buff, "o");
+      generic_message_box( buff, "!");
       }
 
 #ifdef FUTURE_SATELLITE_OBS_CHECKING
@@ -4182,12 +4167,11 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
          if( rval[i].note2 == 'x')     /* check for deleted satellite observation */
             {
             int j = -1;
-            const double thresh = 1.1e-5;    /* allow for roundoff */
 
-            if( i > 0 && rval[i].jd - rval[i-1].jd < thresh
+            if( i > 0 && times_very_close( rval + i, rval + i - 1)
                        && !strcmp( rval[i].mpc_code, rval[i - 1].mpc_code))
                j = i-1;
-            if( i < n_obs_actually_loaded - 1 && rval[i+1].jd - rval[i].jd < thresh
+            if( i < n_obs_actually_loaded - 1 && times_very_close( rval + i + 1, rval + i)
                        && !strcmp( rval[i].mpc_code, rval[i + 1].mpc_code))
                j = i+1;
             if( j >= 0)
@@ -4199,11 +4183,9 @@ OBSERVE FAR *load_observations( FILE *ifile, const char *packed_desig,
       reset_object_type( rval, n_obs_actually_loaded);
       apply_excluded_observations_file( rval, n_obs_actually_loaded);
       }
-#ifdef CONSOLE
    snprintf_err( buff, sizeof( buff), "%d observations actually loaded", n_obs_actually_loaded);
    move_add_nstr( 1, 2, buff, -1);
    refresh_console( );
-#endif
    return( rval);
 }
 
@@ -4269,6 +4251,59 @@ void sort_object_info( OBJECT_INFO *ids, const int n_ids,
                                     &object_info_compare_method);
 }
 
+const char *desig_pattern = NULL, *fullname_pattern = NULL;
+
+/* One can specify,  e.g.,  '-N C314159,K22Ea4C' to process only
+those two objects.  I may eventually implement something more
+regular expression-ish. */
+
+static bool desig_pattern_matched( OBJECT_INFO *id, const char *pattern)
+{
+   char packed_desig[13];
+   size_t i = 0, j;
+
+   strlcpy_error( packed_desig, id->packed_desig);
+   text_search_and_replace( packed_desig, " ", "");
+   while( pattern[i])
+      {
+      char tpattern[30];
+
+      j = i;
+      while( pattern[j] != ',' && pattern[j])
+         j++;
+      assert( j - i < sizeof( tpattern) - 1);
+      strlcpy( tpattern, pattern + i, j - i + 1);
+      if( pattern_match( tpattern, packed_desig))
+         return( true);
+      i = j;
+      if( pattern[i] == ',')
+         i++;
+      }
+   return( false);
+}
+
+static bool fullname_pattern_matched( const char *full_name, const char *pattern)
+{
+   size_t i = 0, j;
+
+   while( pattern[i])
+      {
+      char tpattern[80];
+
+      j = i;
+      while( pattern[j] != ',' && pattern[j])
+         j++;
+      assert( j - i < sizeof( tpattern) - 1);
+      strlcpy( tpattern, pattern + i, j - i + 1);
+      if( pattern_match( tpattern, full_name))
+         return( true);
+      i = j;
+      if( pattern[i] == ',')
+         i++;
+      }
+   return( false);
+}
+
 /* find_objects_in_file( ) reads through the file of MPC astrometric data
    specified by 'filename',  and figures out which objects appear in that
    file.  Those objects can then be listed on the console (findorb) or
@@ -4296,13 +4331,11 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
    int i, n = 0, n_alloced = 20, prev_loc = -1;
    const int fixing_trailing_and_leading_spaces =
                *get_environment_ptr( "FIX_OBSERVATIONS");
-   char buff[550], mpc_code_from_neocp[4], desig_from_neocp[15];
+   char buff[MAX_ADES_LINE_LEN], mpc_code_from_neocp[4], desig_from_neocp[15];
    void *ades_context;
-#ifdef CONSOLE
    const clock_t t0 = clock( );
    int next_output = 2000, n_obs_read = 0;
    long filesize;
-#endif
 
    if( obj_name_stack)
       {
@@ -4319,11 +4352,9 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
          *n_found = -1;
       return( NULL);
       }
-#ifdef CONSOLE
    fseek( ifile, 0L, SEEK_END);
    filesize = ftell( ifile);
    fseek( ifile, 0L, SEEK_SET);
-#endif
    *mpc_code_from_neocp = '\0';
    *desig_from_neocp = '\0';
    *new_xdesig = *new_name = '\0';
@@ -4338,7 +4369,7 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
       {
       size_t iline_len = strlen( buff);
       bool is_neocp = false;
-      double jd;
+      double jd = 0.;
 
       if( debug_level > 8)
          debug_printf( "Input line len %d\n", (int)strlen( buff));
@@ -4355,10 +4386,11 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
       if( iline_len > MINIMUM_RWO_LENGTH)
          rwo_to_mpc( buff, NULL, NULL, NULL, NULL, NULL);
       if( fixing_trailing_and_leading_spaces)
-         fix_up_mpc_observation( buff);
+         fix_up_mpc_observation( buff, &jd);
       if( debug_level > 8)
          debug_printf( "After fixup: %d\n", (int)strlen( buff));
-      jd = observation_jd( buff);
+      if( !jd)
+         jd = observation_jd( buff);
       if( jd && *new_xdesig)   /* previous line was "COM = (xdesig)";   */
          {                    /* add a new cross-designation to the table */
          memcpy( new_xdesig, buff, 12);
@@ -4449,7 +4481,6 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
                n_alloced = new_size;
                prev_loc = -1;
                }
-#ifdef CONSOLE
             n_obs_read++;
             if( n_obs_read == next_output)
                {
@@ -4472,7 +4503,6 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
                move_add_nstr( 4, 3, msg_buff, -1);
                refresh_console( );
                }
-#endif
             }
       if( *buff == '#')
          {
@@ -4491,6 +4521,10 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
          }
       if( !memcmp( buff, "#= ", 3))
          {
+         char *equals_ptr = strchr( buff + 3, '=');
+
+         if( equals_ptr)            /* if given multiple xrefs,  just */
+            *equals_ptr = '\0';     /* use the first one */
          *new_xdesig = '!';
          strlcpy( new_xdesig + 13, buff + 3, 20);
          strlcat( new_xdesig + 13, "            ", 14);
@@ -4517,15 +4551,37 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
       if( rval[i].packed_desig[0])
          rval[n++] = rval[i];
    assert( n == *n_found);
+   if( desig_pattern)
+      {
+      i = 0;
+      while( i < n)
+         if( !desig_pattern_matched( rval + i, desig_pattern))
+            {
+            memmove( rval + i, rval + i + 1, (n - i - 1) * sizeof( OBJECT_INFO));
+            n--;
+            }
+         else
+            i++;
+      }
    rval = (OBJECT_INFO *)realloc( rval, n * sizeof( OBJECT_INFO));
            /* Only now do we set the 'full' object names,  because  */
            /* some may have been added mid-file using COM fullname. */
    for( i = 0; i < n; i++)
       {
       get_object_name( buff, rval[i].packed_desig);
-      rval[i].obj_name = (char *)stack_alloc( obj_name_stack, strlen( buff) + 1);
-      strcpy( rval[i].obj_name, buff);
+      if( fullname_pattern && !fullname_pattern_matched( buff, fullname_pattern))
+         {
+         memmove( rval + i, rval + i + 1, (n - i - 1) * sizeof( OBJECT_INFO));
+         n--;
+         i--;
+         }
+      else
+         {
+         rval[i].obj_name = (char *)stack_alloc( obj_name_stack, strlen( buff) + 1);
+         strcpy( rval[i].obj_name, buff);
+         }
       }
+   *n_found = n;
    sort_object_info( rval, n, OBJECT_INFO_COMPARE_PACKED);
    return( rval);
 }
@@ -4536,7 +4592,7 @@ OBJECT_INFO *find_objects_in_file( const char *filename,
    In Find_Orb, these details are shown for the station that made
    the currently-selected observation. */
 
-void put_observer_data_in_text( const char FAR *mpc_code, char *buff)
+int put_observer_data_in_text( const char FAR *mpc_code, char *buff)
 {
    double lon, lat, alt_in_meters;
    const int planet_idx = get_observer_data_latlon( mpc_code, buff,
@@ -4557,13 +4613,16 @@ void put_observer_data_in_text( const char FAR *mpc_code, char *buff)
       memmove( buff, name, strlen( name) + 1);
       if( lon || lat)
          {
-         const char *output_format = "  (%c%.6f %c%.6f)";
-
          lon *= 180. / PI;
          lat *= 180. / PI;
-         snprintf_append( buff, buffsize, output_format,
+         if( memcmp( name, "User-supplied", 13))
+            {
+            const char *output_format = "  (%c%.6f %c%.6f)";
+
+            snprintf_append( buff, buffsize, output_format,
                            (lat > 0. ? 'N' : 'S'), fabs( lat),
                            (lon > 0. ? 'E' : 'W'), fabs( lon));
+            }
          if( planet_idx == 3)
             {
             FILE *ifile = fopen_ext( "geo_rect.txt", "fcrb");
@@ -4577,6 +4636,7 @@ void put_observer_data_in_text( const char FAR *mpc_code, char *buff)
             }
          }
       }
+   return( planet_idx);
 }
 
 static const char *environ_dot_dat = "environ.dat";
@@ -4591,7 +4651,12 @@ int write_environment_pointers( void)
 
    fprintf( ofile, "%d vars\n", (int)n_lines);
    for( i = 0; i < n_lines; i++)
-      fprintf( ofile, "%s\n", edata[i]);
+      {
+      const size_t len = strlen( edata[i]);
+
+      if( len && edata[i][len - 1] != '=')
+         fprintf( ofile, "%s\n", edata[i]);
+      }
    fclose( ofile);
    return( (int)n_lines);
 }
@@ -4741,7 +4806,6 @@ int load_environment_file( const char *filename)
 {
    FILE *ifile = fopen_ext( filename, (is_default_environment ? "crb" : "rb"));
    char buff[300], *tptr;
-   int n_lines = 0, n_set = 0;
 
    if( !ifile)
       return( -1);
@@ -4772,10 +4836,7 @@ int load_environment_file( const char *filename)
          {
          *tptr = '\0';
          set_environment_ptr( buff, tptr + 1);
-         n_set++;
          }
-      else
-         n_lines++;
    fclose( ifile);
    return( 0);
 }
@@ -4803,7 +4864,7 @@ void update_environ_dot_dat( void)
 
       if( !text)
          text = load_file_into_memory( "environ.def", NULL, true);
-      ofile = fopen_ext( environ_dot_dat, "tfcwb");
+      ofile = fopen_ext( environ_dot_dat, "fcwb");
       assert( ofile);
       for( i = 0; text[i]; i++)
          {
@@ -4911,25 +4972,26 @@ result in a D or later half-month specification.  And it couldn't be 2012,
 because it would then have a B or A half-month specification.)   That's why
 the observation JD is passed in. */
 
-static void reference_to_text( char *obuff, const char *reference,
-                                            const double jd)
+static void reference_to_text( char *obuff, const size_t obuff_size,
+                                 const char *reference, const double jd)
 {
+   assert( 5 == strlen( reference));
    if( !strcmp( reference, "     "))       /* no reference given */
       *obuff = '\0';
    else if( !strcmp( reference, "neocp"))
       strcpy( obuff, "NEOCP");
    else if( *reference >= '0' && *reference <= '9')
-      sprintf( obuff, "MPC %s", reference);
+      snprintf_err( obuff, obuff_size, "MPC %s", reference);
    else if( *reference == '@')
-      sprintf( obuff, "MPC 10%s", reference + 1);
+      snprintf_err( obuff, obuff_size, "MPC 10%s", reference + 1);
    else if( *reference >= 'a' && *reference <= 'z')
-      sprintf( obuff, "MPS %d%s", *reference - 'a', reference + 1);
+      snprintf_err( obuff, obuff_size, "MPS %d%s", *reference - 'a', reference + 1);
    else if( *reference == 'E')
       {
       int obs_year, curr_year;
       char obs_letter, curr_letter;
 
-      sprintf( obuff, "MPEC ?  ?-%c%d", reference[1], atoi( reference + 2));
+      snprintf_err( obuff, obuff_size, "MPEC ?  ?-%c%d", reference[1], atoi( reference + 2));
       obuff[6] = obuff[7] = '?';    /* attempt to evade trigraph oddities */
       obs_year = get_year_and_mpc_half_month_letter( jd, &obs_letter);
       curr_year = get_year_and_mpc_half_month_letter( current_jd( ), &curr_letter);
@@ -4939,17 +5001,17 @@ static void reference_to_text( char *obuff, const char *reference,
          obs_year++;
       if( curr_year == obs_year)    /* this reference can only mean one year: */
          {
-         sprintf( obuff + 5, "%4d", curr_year);
+         snprintf_err( obuff + 5, obuff_size - 5, "%4d", curr_year);
          obuff[9] = '-';
          }
       }
    else if( *reference == 'D' && isdigit( reference[1]))
-      sprintf( obuff, "DASO %d", atoi( reference + 1));
+      snprintf_err( obuff, obuff_size, "DASO %d", atoi( reference + 1));
    else if( *reference == '~' || *reference == '#')   /* MPS or MPC number, */
       {                 /* packed as four "mutant hex" (base 62) digits */
       const unsigned number = get_mutant_hex_value( reference + 1, 4);
 
-      sprintf( obuff, "MP%c %u", ((*reference == '~') ? 'S' : 'C'),
+      snprintf_err( obuff, obuff_size, "MP%c %u", ((*reference == '~') ? 'S' : 'C'),
                         number + ((*reference == '~') ? 260000 : 110000));
       }
    else           /* just copy it in,  but add a space */
@@ -4959,7 +5021,7 @@ static void reference_to_text( char *obuff, const char *reference,
       *obuff++ = ' ';
       while( *reference == '0')
          reference++;
-      strcpy( obuff, reference);
+      strlcpy_err( obuff, reference, obuff_size);
       }
 }
 
@@ -5010,21 +5072,22 @@ static void format_motion( char *obuff, const double motion)
    static const char degree_symbol = (char)0xf8;
 #endif
    const double fabs_motion = fabs( motion);
+   const size_t obuff_size = 12;
 
    if( fabs_motion < 99.)
-      sprintf( obuff, "%5.2f'/hr", motion);
+      snprintf_err( obuff, obuff_size, "%5.2f'/hr", motion);
    else if( fabs_motion < 999.)
-      sprintf( obuff, "%5.1f'/hr", motion);
+      snprintf_err( obuff, obuff_size, "%5.1f'/hr", motion);
    else if( fabs_motion < 99999.)
-      sprintf( obuff, "%5.0f'/hr", motion);
+      snprintf_err( obuff, obuff_size, "%5.0f'/hr", motion);
    else if( fabs_motion < 99999. * 60.)
-      sprintf( obuff, "%5.0f%c/hr", motion / 60., degree_symbol);
+      snprintf_err( obuff, obuff_size, "%5.0f%c/hr", motion / 60., degree_symbol);
    else if( fabs_motion < 99999. * 3600.)
-      sprintf( obuff, "%5.0f%c/min", motion / 3600., degree_symbol);
+      snprintf_err( obuff, obuff_size, "%5.0f%c/min", motion / 3600., degree_symbol);
    else if( fabs_motion < 99999. * 216000.)
-      sprintf( obuff, "%5.0f%c/sec", motion / 216000., degree_symbol);
+      snprintf_err( obuff, obuff_size, "%5.0f%c/sec", motion / 216000., degree_symbol);
    else
-      strcpy( obuff, "!!!!!");
+      strlcpy_err( obuff, "!!!!!", obuff_size);
 }
 
 static double relative_velocity( const double *loc1, const double *vel1,
@@ -5116,8 +5179,8 @@ int compute_radar_info( const OBSERVE *obs, RADAR_INFO *rinfo)
    memcpy( tbuff, first_line + 62, 5);
    tbuff[5] = '.';
    tbuff[6] = first_line[67];
-   memcpy( tbuff + 7, obs->second_line + 62, 8);
-   tbuff[15] = '\0';
+   memcpy( tbuff + 7, obs->second_line + 62, 6);
+   tbuff[13] = '\0';
    rinfo->freq_hz = atof( tbuff) * 1e+6;   /* cvt MHz to Hz */
    rinfo->rtt_obs = extract_radar_value( first_line + 32) * 1.e-6;
    rinfo->rtt_sigma = extract_radar_value( obs->second_line + 32) * 1e-6;
@@ -5133,22 +5196,25 @@ static void show_radar_info( char *buff, const OBSERVE *obs)
    RADAR_INFO rinfo;
 
    compute_radar_info( obs, &rinfo);
-   sprintf( buff, "RTDist (C) %.8fs = %.3f km; Dopp %.8f km/s = %.2f Hz",
+   snprintf_err( buff, 90, "RTDist (C) %.8fs = %.3f km; Dopp %.8f km/s = %.2f Hz",
                rinfo.rtt_comp, rinfo.rtt_comp * SPEED_OF_LIGHT,
                rinfo.doppler_comp * SPEED_OF_LIGHT / rinfo.freq_hz,
                rinfo.doppler_comp);
 }
 
-static size_t strip_trailing_zeroes( char *buff)
+static void strip_trailing_zeroes( char *buff)
 {
-   size_t i = strlen( buff);
+   buff = strchr( buff, '.');
+   if( buff)
+      {
+      size_t i = strlen( buff);
 
-   while( i && buff[i - 1] == '0')
-      i--;
-   if( i && buff[i - 1] == '.')
-      i--;
-   buff[i] = '\0';
-   return( i);
+      while( i && buff[i - 1] == '0')
+         i--;
+      if( i == 1)
+         i = 0;
+      buff[i] = '\0';
+      }
 }
 
 /* get_net_used_from_obs_header( ) looks through the observation header
@@ -5205,8 +5271,8 @@ static int generate_observation_text( const OBSERVE FAR *obs, const int idx,
    const double earth_sun = vector3_length( optr->obs_posn);
 
    *buff = '\0';
-   if( buffsize > 100)      /* no line should be larger than this, */
-      buffsize = 100;       /* even if the buffer does have room for it */
+   if( buffsize > 110)      /* no line should be larger than this, */
+      buffsize = 110;       /* even if the buffer does have room for it */
    switch( line_number)
       {
       case 0:
@@ -5313,11 +5379,11 @@ static int generate_observation_text( const OBSERVE FAR *obs, const int idx,
             snprintf_append( buff, buffsize, "   radial vel %.3f km/s  cross ",
                                       m.radial_vel);
             if( fabs( m.cross_residual) < 9.9)
-               sprintf( tbuff, "%.2f", m.cross_residual);
+               snprintf_err( tbuff, sizeof( tbuff), "%.2f", m.cross_residual);
             else if( fabs( m.cross_residual) < 99.9)
-               sprintf( tbuff, "%4.1f", m.cross_residual);
+               snprintf_err( tbuff, sizeof( tbuff), "%4.1f", m.cross_residual);
             else if( fabs( m.cross_residual) < 9999.)
-               sprintf( tbuff, "%4d", (int)m.cross_residual);
+               snprintf_err( tbuff, sizeof( tbuff), "%4d", (int)m.cross_residual);
             else
                strlcpy_error( tbuff, "!!!!");
             strlcat_err( buff, tbuff, buffsize);
@@ -5373,25 +5439,30 @@ static int generate_observation_text( const OBSERVE FAR *obs, const int idx,
                   || optr->posn_sigma_1 != optr->posn_sigma_2)
             if( optr->note2 != 'R')
                {
-               int tilt_angle = 0;
                char sig1_buff[20], sig2_buff[20];
 
                snprintf_err( sig1_buff, sizeof( sig1_buff), "%.6f", optr->posn_sigma_1);
                remove_insignificant_digits( sig1_buff);
+               strip_trailing_zeroes( sig1_buff);
                snprintf_err( sig2_buff, sizeof( sig2_buff), "%.6f", optr->posn_sigma_2);
                remove_insignificant_digits( sig2_buff);
+               strip_trailing_zeroes( sig2_buff);
+               strlcpy_err( buff, "Sigma ", buffsize);
                if( strcmp( sig1_buff, sig2_buff))
                   {
-                  strlcat_err( sig1_buff, "x", sizeof( sig1_buff));
-                  strlcat_err( sig1_buff, sig2_buff, sizeof( sig1_buff));
-                  tilt_angle = (int)( optr->posn_sigma_theta * 180. / PI);
+                  const int tilt_angle =
+                               (int)( optr->posn_sigma_theta * 180. / PI + 0.5) % 180;
+
+                  if( !tilt_angle)  /* PA=0 means sig1 = sigma(dec), sig2 = sigma(RA) */
+                      snprintf_append( buff, buffsize, "%sx%s\" ", sig2_buff, sig1_buff);
+                  else
+                      snprintf_append( buff, buffsize, "%sx%s\" %d ", sig1_buff, sig2_buff, tilt_angle);
                   }
-               snprintf_err( buff, buffsize, "Sigma %s\" ", sig1_buff);
-               if( tilt_angle % 180)
-                  snprintf_append( buff, buffsize, "%d ", tilt_angle);
+               else
+                  snprintf_append( buff, buffsize, "%s\" ", sig1_buff);
                }
          end_ptr = buff + strlen( buff);
-         reference_to_text( end_ptr, optr->reference, optr->jd);
+         reference_to_text( end_ptr, 15, optr->reference, optr->jd);
          if( *end_ptr)
             strlcat_err( buff, "  ", buffsize);
          if( !get_obs_alt_azzes( optr, &sun_alt_az, &object_alt_az))
@@ -5450,6 +5521,9 @@ static int generate_observation_text( const OBSERVE FAR *obs, const int idx,
             *buff = '\0';
          snprintf_append( buff, buffsize, "time sigma %g",
                           optr->time_sigma * seconds_per_day);
+         if( optr->unc_time)
+            snprintf_append( buff, buffsize, "  uncTime %g",
+                          optr->unc_time * seconds_per_day);
          if( optr->ra_bias || optr->dec_bias)
              snprintf_append( buff, buffsize, "  %cRA bias %.3f\" dec bias %.3f\"%c",
                            (apply_debiasing ? ' ' : '['),
@@ -5729,7 +5803,7 @@ int sanity_test_observations( const char *filename)
                   n_problems_found++;
                   }
             override_time = 0.;
-            override_ra = override_dec = -100.;
+            override_ra = override_dec = override_mag = -100.;
             }
       }
    fclose( ifile);
diff --git a/mpc_obs.h b/mpc_obs.h
index 99b8c6f0..735c0645 100644
--- a/mpc_obs.h
+++ b/mpc_obs.h
@@ -26,6 +26,7 @@ OBSERVE
    double posn_sigma_theta;   /* tilt angle of uncertainty ellipse */
    double mag_sigma;
    double time_sigma;         /* in days */
+   double unc_time;           /* uncTime (semi-systematic timing err) in days */
    double computed_mag;
    double ra_bias, dec_bias;     /* in arcseconds */
    char *second_line;
@@ -167,6 +168,7 @@ typedef uint64_t ephem_option_t;
 #define OPTION_EXPOSURE_TIME            EPHEM_OPTION_BIT( 36)
 #define OPTION_EXPLANATIONS             EPHEM_OPTION_BIT( 37)
 #define OPTION_CONSTELLATION            EPHEM_OPTION_BIT( 38)
+#define OPTION_RV_AND_DELTA_SIGMAS      EPHEM_OPTION_BIT( 39)
 
 #define ORBIT_SIGMAS_REQUESTED         1
 #define NO_ORBIT_SIGMAS_REQUESTED    (-1)
@@ -220,7 +222,7 @@ int get_object_name( char *obuff, const char *packed_desig);
 int get_observer_data( const char FAR *mpc_code, char *buff, mpc_code_t *cinfo);
 void recreate_observation_line( char *obuff, const OBSERVE FAR *obs,
                            const int residual_format);   /* ephem0.cpp */
-void put_observer_data_in_text( const char FAR *mpc_code, char *buff);
+int put_observer_data_in_text( const char FAR *mpc_code, char *buff);
 
 void create_obs_file( const OBSERVE FAR *obs, int n_obs, const int append,
                   const int resid_format);            /* ephem0.cpp */
@@ -276,7 +278,7 @@ int compute_observer_loc( const double jde, const int planet_no,
 int compute_observer_vel( const double jde, const int planet_no,
                const double rho_cos_phi,                    /* mpc_obs.cpp */
                const double rho_sin_phi, const double lon, double FAR *offset);
-int get_findorb_text( char *buff, const int ival);    /* ephem.cpp */
+const char *get_find_orb_text( const int index);    /* elem_out.cpp */
 int write_out_elements_to_file( const double *orbit,
             const double curr_epoch,
             const double epoch_shown,
@@ -384,7 +386,14 @@ void push_orbit( const double epoch, const double *orbit); /* orb_fun2.cpp */
 int pop_orbit( double *epoch, double *orbit);              /* orb_fun2.cpp */
 void pop_all_orbits( void);                                /* orb_fun2.cpp */
 
-int get_sr_orbits( double *orbits, OBSERVE FAR *obs,     /* orb_func.cpp */
+typedef struct
+{
+   double rparam, vparam, orbit[6], score;
+} sr_orbit_t;
+
+int find_nth_sr_orbit( sr_orbit_t *orbit, OBSERVE FAR *obs, int n_obs,
+                            const int orbit_number);         /* orb_func.cpp */
+int get_sr_orbits( sr_orbit_t *orbits, OBSERVE FAR *obs,     /* orb_func.cpp */
                const unsigned n_obs, const unsigned starting_orbit,
                const unsigned max_orbits, const double max_time,
                const double noise_in_sigmas, const int writing_sr_elems);
@@ -477,9 +486,19 @@ Yarkovsky with A2 (both inverse-square and both one added parameter). */
 #define FORCE_MODEL_COMET_THREE_PARAM  0x03
 #define FORCE_MODEL_COMET_FOUR_PARAM   0x04
 
-/* Not used yet : for some rocks,  Yarkovsky can be modelled as an
-A2 (along-orbit) inverse square force.  This is currently handled by
-selecting a two-parameter SRP model and constraining A1=0.   */
+/* If we think there was a delta-v,  due to spacecraft maneuver or impact
+or something else,  it can be described in four parameters : three for
+the amount of the delta-V,  and a fourth saying when it happened.  At
+some point,  there will probably be a model with Yet Another Parameter
+so that we can solve for the circumstances of the delta-V _and_ the
+object's area/mass ratio at the same time.  This 'Delta-V plus SRP'
+model has not yet been implemented.    */
+
+#define FORCE_MODEL_DELTA_V            0x204
+#define FORCE_MODEL_DELTA_V_SRP        0x205
+
+/* For some rocks,  Yarkovsky can be modelled as an A2 (along-orbit)
+inverse square force.  */
 
 #define FORCE_MODEL_YARKO_A2           0x111
 
@@ -488,3 +507,15 @@ extern int force_model;
 bool is_inverse_square_force_model( void);
 
 const char *find_orb_version_jd( double *jd);
+
+      /* In the console version of Find_Orb,  the following two functions */
+      /* get remapped to Curses functions.  In the non-interactive one,   */
+      /* they're mapped to 'do-nothings'.  See fo.cpp & find_orb.cpp.     */
+void refresh_console( void);
+void move_add_nstr( const int col, const int row, const char *msg, const int n_bytes);
+
+#define COLOR_DEFAULT_INQUIRY       12
+#define COLOR_ATTENTION             13
+
+int inquire( const char *prompt, char *buff, const int max_len,
+                     const int color);
diff --git a/mu1.txt b/mu1.txt
index 48ff7572..fc59e411 100644
--- a/mu1.txt
+++ b/mu1.txt
@@ -1,308 +1,349 @@
-;   Converted 2013 Feb 10 from a file provided by Jim Baer
-;   See 'mu.txt' in ftp://cfa-ftp.harvard.edu/pub/MPC/BC405/ for
-;   the original version (as well as the BC405 orbital elements and
-;   some documentation.)  The following masses are in units of Sun=1.
-;   Solar GM = 1.32712440018 x 10^20 (+/- 8 x 10^9) m^3/s^2
-;   2016 Oct 3: replaced Ceres 4.755e-10 and Vesta 1.344e-10 with Dawn's
-;   measurements: Ceres GM=62.68 km^3/s^2 = 4.72299e-10,  Vesta
-;   (2.59076 +/- 0.00001)x10^20 kg =  1.30284e-10 solar masses
-     1  4.7230e-10  Ceres
-     2  1.060e-10  Pallas
-     4  1.303e-10  Vesta
-    29  7.700e-12  Amphitrite
-    16  1.140e-11  Psyche
-    15  1.600e-11  Eunomia
-    10  4.420e-11  Hygiea
-     7  7.300e-12  Iris
-     6  6.300e-12  Hebe
-     3  1.500e-11  Juno
-   345  2.941e-13  Tercidina
-    12  1.019e-12  Victoria
-   442  1.002e-13  Eichsfeldia
-    27  1.598e-12  Euterpe
-   287  2.196e-13  Nephthys
-    43  2.032e-13  Ariadne
-    84  1.750e-13  Klio
-    30  9.510e-13  Urania
-   536  1.225e-12  Merapi
-   163  1.351e-13  Erigone
-   105  5.956e-13  Artemis
-   554  3.108e-13  Peraga
-   313  3.154e-13  Chaldaea
-   115  3.616e-13  Thyra
-   230  9.201e-13  Athamantis
-   337  2.881e-13  Devosa
-    80  3.424e-13  Sappho
-     9  7.200e-12  Metis
-    63  7.798e-13  Ausonia
-    25  3.014e-13  Phocaea
-   192  7.825e-13  Nausikaa
-   304  1.102e-13  Olga
-    20  1.900e-12  Massalia
-   566  1.677e-12  Stereoskopia
-   654  7.294e-13  Zelinda
-   135  6.941e-13  Hertha
-   618  6.140e-13  Elfriede
-   635  3.344e-13  Vundtia
-    21  1.300e-12  Lutetia
-    42  7.150e-13  Isis
-    19  4.190e-12  Fortuna
-    11  2.500e-12  Parthenope
-   168  1.153e-12  Sibylla
-    17  6.800e-13  Thetis
-  1467  4.956e-13  Mashona
-   329  1.661e-13  Svea
-    46  6.742e-13  Hestia
-   751  4.759e-13  Faina
-    89  2.469e-12  Julia
-   449  2.212e-13  Hamburga
-   334  1.334e-12  Chicago
-   134  6.607e-13  Sophrosyne
-   535  1.458e-13  Montague
-   626  3.605e-13  Notburga
-     5  1.271e-12  Astraea
-   712  7.323e-13  Boliviana
-   107  5.630e-12  Camilla
-   409  1.489e-12  Aspasia
-   362  3.320e-13  Havnia
-   405  6.873e-13  Thia
-    32  3.744e-13  Pomona
-    14  2.700e-12  Irene
-    91  4.672e-13  Aegina
-   111  3.060e-12  Ate
-  1015  3.213e-13  Christa
-   404  3.291e-13  Arsinoe
-   344  8.159e-13  Desiderata
-   849  3.296e-13  Ara
-   389  3.502e-13  Industria
-   347  1.881e-13  Pariana
-    70  6.432e-13  Panopaea
-   194  1.685e-12  Prokne
-    53  5.418e-13  Kalypso
-    78  6.187e-13  Diana
-   407  3.031e-13  Arachne
-   454  1.914e-13  Mathesis
-    23  8.837e-13  Thalia
-   124  3.164e-13  Alkeste
-   164  4.074e-13  Eva
-    37  9.041e-13  Fides
-    72  2.252e-13  Feronia
-   224  3.296e-13  Oceana
-   369  3.014e-13  Aeria
-    50  3.508e-13  Virginia
-   476  5.615e-13  Hedwig
-   713  4.144e-13  Luscinia
-    85  1.308e-12  Io
-    26  6.107e-13  Proserpina
-   455  2.121e-13  Bruchsalia
-   144  1.005e-12  Vibilia
-   488  1.193e-12  Kreusa
-   466  5.439e-13  Tisiphone
-   511  1.930e-11  Davida
-   240  3.956e-13  Vanadis
-  1036  2.255e-14  Ganymed
-   141  7.935e-13  Lumen
-    97  7.928e-13  Klotho
-   326  2.837e-13  Tamara
-    77  4.633e-13  Frigga
-   694  2.639e-13  Ekard
-   145  1.218e-12  Adeona
-    75  2.406e-13  Eurydike
-   225  6.170e-13  Henrietta
-   201  4.463e-13  Penelope
-   324  5.100e-12  Bamberga
-    34  5.163e-13  Circe
-    98  4.019e-13  Ianthe
-    31  2.800e-11  Euphrosyne
-   175  3.626e-13  Andromache
-   109  2.524e-13  Felicitas
-    58  2.877e-13  Concordia
-   103  5.391e-13  Hera
-    59  1.579e-12  Elpis
-    54  1.606e-12  Alexandra
-   146  8.150e-13  Lucina
-    45  2.860e-12  Eugenia
-   209  1.443e-12  Dido
-   410  6.646e-13  Chloris
-   160  1.891e-13  Una
-   140  4.668e-13  Siwa
-   156  6.247e-13  Xanthippe
-   110  8.902e-13  Lydia
-   187  7.975e-13  Lamberta
-    18  1.510e-12  Melpomene
-   387  7.216e-13  Aquitania
-   200  7.460e-13  Dynamene
-   185  1.378e-12  Eunike
-    57  1.014e-12  Mnemosyne
-   247  8.569e-13  Eukrate
-   372  2.367e-12  Palma
-   980  4.551e-13  Anacostia
-   481  5.121e-13  Emita
-   521  5.456e-13  Brixia
-   206  5.090e-13  Hersilia
-    38  5.496e-13  Leda
-   173  1.291e-12  Ino
-    36  4.155e-13  Atalante
-   171  5.605e-13  Ophelia
-   490  1.328e-12  Veritas
-   381  6.184e-13  Myrrha
-   128  2.350e-12  Nemesis
-    93  9.882e-13  Minerva
-    71  4.126e-13  Niobe
-   356  7.986e-13  Liguria
-   127  6.617e-13  Johanna
-    41  1.858e-12  Daphne
-   143  2.565e-13  Adria
-    94  3.034e-12  Aurora
-    39  2.376e-12  Laetitia
-    88  5.300e-12  Thisbe
-   433  3.362e-15  Eros
-     8  3.400e-12  Flora
-   532  8.680e-12  Herculina
-    92  2.819e-12  Undina
-   275  5.365e-13  Sapientia
-    65  7.200e-12  Cybele
-   444  3.600e-12  Gyptis
-   393  3.208e-13  Lampetia
-   147  8.286e-13  Protogeneia
-   205  1.870e-13  Martha
-    28  1.256e-12  Bellona
-   139  1.355e-12  Juewa
-    68  1.309e-12  Leto
-   322  4.960e-13  Phaeo
-   416  4.438e-13  Vaticana
-   216  3.438e-12  Kleopatra
-   354  2.655e-12  Eleonora
-   346  8.590e-13  Hermentaria
-   236  4.552e-13  Honoria
-   365  4.192e-13  Corduba
-   266  4.579e-13  Aline
-   804  1.990e-12  Hispania
-   385  5.450e-13  Ilmatar
-    81  5.956e-13  Terpsichore
-   909  5.569e-13  Ulla
-   129  2.725e-12  Antigone
-   508  1.017e-12  Princetonia
-   195  2.221e-13  Eurykleia
-    47  1.090e-12  Aglaja
-   104  6.673e-13  Klymene
-   426  7.242e-13  Hippo
-   471  1.717e-12  Papagena
-   431  3.027e-13  Nephele
-   386  1.585e-12  Siegena
-   238  1.155e-12  Hypatia
-   338  3.507e-13  Budrosa
-    22  4.070e-12  Kalliope
-    24  4.000e-12  Themis
-   674  6.557e-13  Rachele
-   702  3.040e-12  Alauda
-    40  8.859e-13  Harmonia
-   705  8.529e-13  Erminia
-   776  1.219e-12  Berbericia
-   375  3.555e-12  Ursula
-    69  3.677e-12  Hesperia
-   150  1.218e-12  Nuwa
-   117  1.160e-12  Lomia
-    35  3.867e-13  Leukothea
-   747  1.785e-12  Winchester
-   772  5.746e-13  Tanete
-   360  5.472e-13  Carlova
-   388  5.249e-13  Charybdis
-   250  7.076e-13  Bettina
-   176  6.255e-13  Iduna
-   162  6.917e-13  Laurentia
-   350  5.847e-13  Ornamenta
-   506  4.194e-13  Marion
-   211  1.036e-12  Isolda
-   514  4.221e-13  Armida
-   241  1.700e-12  Germania
-   740  2.649e-13  Cantabia
-    96  1.730e-12  Aegle
-   663  3.621e-13  Gerlinde
-   451  4.016e-12  Patientia
-   895  1.008e-12  Helio
-   423  3.210e-12  Diotima
-    95  8.881e-13  Arethusa
-    49  1.540e-12  Pales
-   602  6.843e-13  Marianna
-    52  1.300e-11  Europa
-   159  6.883e-13  Aemilia
-   357  4.213e-13  Ninina
-   545  4.863e-13  Messalina
-   469  6.984e-13  Argentina
-   373  3.098e-13  Melusina
-    48  1.300e-11  Doris
-   137  1.085e-12  Meliboea
-    86  6.181e-13  Semele
-   121  2.705e-12  Hermione
-   196  1.801e-12  Philomela
-    62  3.062e-13  Erato
-    90  4.173e-13  Antiope
-   791  3.913e-13  Ani
-   120  1.861e-12  Lachesis
-   683  1.943e-13  Lanzia
-   212  8.897e-13  Medea
-   283  6.938e-13  Emma
-   691  2.378e-13  Lehigh
-   596  5.136e-13  Scheila
-   709  3.176e-13  Fringilla
-   191  3.637e-13  Kolga
-    74  5.901e-13  Galatea
-   203  5.543e-13  Pompeja
-   377  2.662e-13  Campania
-   112  1.326e-13  Iphigenia
-   165  1.318e-12  Loreley
-   363  1.341e-13  Padua
-   276  6.342e-13  Adelheid
-   739  4.367e-13  Mandeville
-  1093  5.610e-13  Freda
-   268  9.656e-13  Adorea
-  1021  3.463e-13  Flammario
-   210  2.295e-13  Isabella
-   505  5.365e-13  Cava
-    99  1.313e-13  Dike
-   690  8.686e-13  Wratislavia
-   366  2.907e-13  Vincentina
-   814  4.637e-13  Tauris
-   788  3.931e-13  Hohensteina
-   303  3.453e-13  Josephina
-   780  2.967e-13  Armenia
-   259  2.010e-12  Aletheia
-   489  9.555e-13  Comacina
-   568  2.322e-13  Cheruskia
-   358  2.525e-13  Apollonia
-   424  2.339e-13  Gratia
-   412  2.655e-13  Elisabetha
-   762  7.040e-13  Pulcova
-   308  9.823e-13  Polyxo
-   102  2.017e-13  Miriam
-    56  5.122e-13  Melete
-   154  2.231e-12  Bertha
-    83  7.516e-13  Beatrix
-   328  1.320e-12  Gudrun
-   769  4.254e-13  Tatjana
-   181  8.465e-13  Eucharis
-   221  7.965e-13  Eos
-   491  3.248e-13  Carina
-   349  1.941e-12  Dembowska
-   148  3.293e-13  Gallia
-   704  1.950e-11  Interamnia
-   595  4.577e-13  Polyxena
-   213  2.018e-13  Lilaea
-   419  7.574e-13  Aurelia
-   335  2.493e-13  Roberta
-   114  3.489e-13  Kassandra
-   233  3.830e-13  Asterope
-   498  7.905e-13  Tokio
-   914  1.586e-13  Palisana
-    44  2.505e-13  Nysa
-   790  1.744e-12  Pretoria
-    76  2.185e-12  Freia
-   420  9.941e-13  Bertholda
-   106  1.111e-12  Dione
-   130  3.320e-12  Elektra
-    13  8.000e-12  Egeria
-    87  7.430e-12  Sylvia
-    51  1.140e-12  Nemausa
-   773  3.109e-13  Irmintraud
-   336  1.174e-13  Lacadiera
+;   Asteroid masses extracted 2023 Jul 24 from DE-441.  Masses are in units
+;   of the sun,  solar GM = 1.32712440018 x 10^20 (+/- 8 x 10^9) m^3/s^2
+;   See 'make_mu.c' in the 'jpl_eph' repository;  it'll probably be needed
+;   if/when an update to DE-441 comes out
+;   Also note : BC-405 only listed 300 asteroids,  and DE-441 gives masses
+;   for 343.  The last 43 are added here in the order found in DE-441.
+     1 4.71914e-10 Ceres
+     2 1.02974e-10 Pallas
+     4 1.30268e-10 Vesta
+    29 6.01150e-12 Amphitrite
+    16 1.19782e-11 Psyche
+    15 1.52436e-11 Eunomia
+    10 4.23860e-11 Hygiea
+     7 8.58904e-12 Iris
+     6 4.87428e-12 Hebe
+     3 1.44717e-11 Juno
+   345 5.37034e-13 Tercidina
+    12 1.10991e-12 Victoria
+   442 1.27339e-13 Eichsfeldia
+    27 8.65590e-13 Euterpe
+   287 1.72570e-13 Nephthys
+    43 4.28624e-13 Ariadne
+    84 2.53308e-13 Klio
+    30 1.92818e-13 Urania
+   536 9.23695e-13 Merapi
+   163 4.56265e-13 Erigone
+   105 4.74781e-13 Artemis
+   554 5.38522e-13 Peraga
+   313 2.42895e-13 Chaldaea
+   115 2.35662e-13 Thyra
+   230 8.97121e-13 Athamantis
+   337 2.47043e-13 Devosa
+    80 1.90838e-13 Sappho
+     9 4.89677e-12 Metis
+    63 9.66463e-13 Ausonia
+    25 1.10035e-13 Phocaea
+   192 2.75154e-13 Nausikaa
+   304 2.70552e-13 Olga
+    20 1.93078e-12 Massalia
+   566 5.74759e-12 Stereoskopia
+   654 6.17452e-13 Zelinda
+   135 4.90553e-13 Hertha
+   618 8.51374e-13 Elfriede
+   635 3.69177e-13 Vundtia
+    21 6.67767e-13 Lutetia
+    42 6.33136e-13 Isis
+    19 4.18914e-12 Fortuna
+    11 3.46675e-12 Parthenope
+   168 2.80023e-12 Sibylla
+    17 4.52793e-13 Thetis
+  1467 3.22375e-13 Mashona
+   329 1.69732e-13 Svea
+    46 2.80232e-12 Hestia
+   751 5.19582e-13 Faina
+    89 1.92618e-12 Julia
+   449 3.84631e-13 Hamburga
+   334 8.15655e-13 Chicago
+   134 4.06928e-13 Sophrosyne
+   535 2.04475e-13 Montague
+   626 2.37303e-13 Notburga
+     5 1.08687e-12 Astraea
+   712 4.25831e-13 Boliviana
+   107 1.08787e-11 Camilla
+   409 3.14523e-12 Aspasia
+   362 3.81083e-13 Havnia
+   405 9.57833e-13 Thia
+    32 2.66110e-13 Pomona
+    14 4.00923e-12 Irene
+    91 4.79735e-13 Aegina
+   111 4.28708e-13 Ate
+  1015 4.99270e-13 Christa
+   404 5.45593e-13 Arsinoe
+   344 4.44963e-13 Desiderata
+   849 3.21449e-13 Ara
+   389 2.70551e-13 Industria
+   347 8.39510e-14 Pariana
+    70 4.12627e-13 Panopaea
+   194 8.30028e-13 Prokne
+    53 2.60536e-13 Kalypso
+    78 6.88316e-13 Diana
+   407 4.10921e-13 Arachne
+   454 2.25737e-13 Mathesis
+    23 9.35178e-13 Thalia
+   124 4.75902e-13 Alkeste
+   164 9.07579e-13 Eva
+    37 8.20558e-13 Fides
+    72 5.09846e-13 Feronia
+   224 1.56751e-13 Oceana
+   369 2.81732e-13 Aeria
+    50 3.06368e-13 Virginia
+   476 3.15265e-12 Hedwig
+   713 3.76772e-13 Luscinia
+    85 2.84225e-12 Io
+    26 6.01956e-13 Proserpina
+   455 3.87998e-13 Bruchsalia
+   144 1.37670e-12 Vibilia
+   488 2.68738e-12 Kreusa
+   466 2.54412e-13 Tisiphone
+   511 2.93453e-11 Davida
+   240 3.12778e-13 Vanadis
+  1036 7.13983e-14 Ganymed
+   141 7.39724e-13 Lumen
+    97 3.46996e-13 Klotho
+   326 2.30902e-13 Tamara
+    77 1.78176e-13 Frigga
+   694 1.72382e-13 Ekard
+   145 1.05840e-12 Adeona
+    75 1.96097e-13 Eurydike
+   225 2.07793e-13 Henrietta
+   201 5.63108e-13 Penelope
+   324 4.66648e-12 Bamberga
+    34 1.06086e-12 Circe
+    98 1.07682e-12 Ianthe
+    31 8.13316e-12 Euphrosyne
+   175 2.47115e-13 Andromache
+   109 2.95165e-13 Felicitas
+    58 6.08711e-13 Concordia
+   103 4.35046e-13 Hera
+    59 2.06962e-12 Elpis
+    54 8.65583e-13 Alexandra
+   146 2.50566e-12 Lucina
+    45 2.71619e-12 Eugenia
+   209 6.59351e-12 Dido
+   410 1.06543e-12 Chloris
+   160 2.20141e-13 Una
+   140 1.13046e-12 Siwa
+   156 9.43117e-13 Xanthippe
+   110 3.80967e-13 Lydia
+   187 2.36519e-12 Lamberta
+    18 1.62822e-12 Melpomene
+   387 1.16193e-12 Aquitania
+   200 5.09061e-13 Dynamene
+   185 4.91399e-13 Eunike
+    57 2.52529e-13 Mnemosyne
+   247 2.43878e-12 Eukrate
+   372 4.17035e-12 Palma
+   980 2.14490e-13 Anacostia
+   481 4.80970e-13 Emita
+   521 5.26647e-13 Brixia
+   206 5.90915e-13 Hersilia
+    38 2.75967e-13 Leda
+   173 1.18091e-12 Ino
+    36 1.69429e-12 Atalante
+   171 1.02269e-12 Ophelia
+   490 4.82172e-13 Veritas
+   381 1.51846e-12 Myrrha
+   128 2.90113e-12 Nemesis
+    93 1.99077e-12 Minerva
+    71 4.43401e-13 Niobe
+   356 8.51260e-13 Liguria
+   127 8.36562e-13 Johanna
+    41 4.07405e-12 Daphne
+   143 8.44277e-13 Adria
+    94 6.58185e-12 Aurora
+    39 5.48747e-12 Laetitia
+    88 8.96531e-12 Thisbe
+   433 3.36269e-15 Eros
+     8 1.93985e-12 Flora
+   532 5.96504e-12 Herculina
+    92 6.83395e-13 Undina
+   275 4.24464e-13 Sapientia
+    65 7.06871e-12 Cybele
+   444 1.43526e-12 Gyptis
+   393 1.13454e-12 Lampetia
+   147 8.40066e-13 Protogeneia
+   205 1.76959e-13 Martha
+    28 1.15047e-12 Bellona
+   139 3.12916e-12 Juewa
+    68 3.95610e-13 Leto
+   322 2.72812e-13 Phaeo
+   416 5.57998e-13 Vaticana
+   216 1.39999e-12 Kleopatra
+   354 2.35879e-12 Eleonora
+   346 3.71236e-13 Hermentaria
+   236 2.11270e-13 Honoria
+   365 2.85206e-13 Corduba
+   266 5.60784e-13 Aline
+   804 8.62683e-13 Hispania
+   385 3.37133e-13 Ilmatar
+    81 4.27805e-13 Terpsichore
+   909 1.33982e-13 Ulla
+   129 4.62787e-13 Antigone
+   508 8.78766e-13 Princetonia
+   195 2.98457e-13 Eurykleia
+    47 3.22679e-12 Aglaja
+   104 1.49157e-12 Klymene
+   426 1.09856e-12 Hippo
+   471 3.43174e-12 Papagena
+   431 4.72483e-13 Nephele
+   386 5.65861e-12 Siegena
+   238 7.49836e-13 Hypatia
+   338 9.68187e-14 Budrosa
+    22 2.97571e-12 Kalliope
+    24 4.43009e-12 Themis
+   674 3.35754e-13 Rachele
+   702 5.65379e-12 Alauda
+    40 1.26368e-12 Harmonia
+   705 1.32190e-12 Erminia
+   776 2.33667e-12 Berbericia
+   375 5.98721e-12 Ursula
+    69 3.79014e-12 Hesperia
+   150 9.09278e-13 Nuwa
+   117 2.97238e-12 Lomia
+    35 2.79506e-13 Leukothea
+   747 3.01313e-12 Winchester
+   772 5.86845e-13 Tanete
+   360 6.92367e-13 Carlova
+   388 9.07911e-13 Charybdis
+   250 1.58645e-12 Bettina
+   176 5.31642e-13 Iduna
+   162 3.34602e-13 Laurentia
+   350 9.41428e-13 Ornamenta
+   506 6.44442e-13 Marion
+   211 2.55487e-13 Isolda
+   514 6.37395e-13 Armida
+   241 2.79066e-12 Germania
+   740 3.88908e-13 Cantabia
+    96 3.18656e-12 Aegle
+   663 6.66601e-13 Gerlinde
+   451 4.38434e-12 Patientia
+   895 6.40139e-13 Helio
+   423 3.89016e-12 Diotima
+    95 1.55541e-12 Arethusa
+    49 2.71395e-12 Pales
+   602 7.70826e-13 Marianna
+    52 2.02169e-11 Europa
+   159 6.50065e-13 Aemilia
+   357 9.70601e-13 Ninina
+   545 6.59650e-13 Messalina
+   469 1.23275e-12 Argentina
+   373 4.36191e-13 Melusina
+    48 6.44960e-12 Doris
+   137 8.88496e-13 Meliboea
+    86 4.85535e-13 Semele
+   121 1.01475e-12 Hermione
+   196 2.42922e-12 Philomela
+    62 5.14120e-13 Erato
+    90 8.93130e-13 Antiope
+   791 7.12241e-13 Ani
+   120 3.39604e-12 Lachesis
+   683 4.05588e-13 Lanzia
+   212 1.50738e-12 Medea
+   283 1.29616e-12 Emma
+   691 1.73057e-13 Lehigh
+   596 2.95709e-12 Scheila
+   709 4.03229e-13 Fringilla
+   191 3.13270e-13 Kolga
+    74 6.42478e-13 Galatea
+   203 1.75068e-12 Pompeja
+   377 3.14398e-13 Campania
+   112 1.03137e-13 Iphigenia
+   165 8.93991e-13 Loreley
+   363 7.56715e-13 Padua
+   276 6.73247e-13 Adelheid
+   739 4.02001e-13 Mandeville
+  1093 4.65480e-13 Freda
+   268 1.30522e-12 Adorea
+  1021 2.71041e-13 Flammario
+   210 2.58978e-13 Isabella
+   505 3.86416e-13 Cava
+    99 1.69463e-13 Dike
+   690 8.73877e-13 Wratislavia
+   366 2.69639e-13 Vincentina
+   814 1.94148e-13 Tauris
+   788 5.98552e-13 Hohensteina
+   303 4.13995e-13 Josephina
+   780 1.92076e-12 Armenia
+   259 1.52921e-12 Aletheia
+   489 9.72435e-13 Comacina
+   568 2.69494e-13 Cheruskia
+   358 3.26813e-13 Apollonia
+   424 3.72413e-13 Gratia
+   412 4.24876e-13 Elisabetha
+   762 1.39049e-12 Pulcova
+   308 7.31562e-13 Polyxo
+   102 2.45724e-13 Miriam
+    56 1.46443e-12 Melete
+   154 6.44207e-12 Bertha
+    83 6.23830e-13 Beatrix
+   328 1.68910e-12 Gudrun
+   769 4.23726e-13 Tatjana
+   181 1.73137e-12 Eucharis
+   221 4.91195e-13 Eos
+   491 3.05250e-13 Carina
+   349 2.62816e-12 Dembowska
+   148 9.33896e-13 Gallia
+   704 2.13274e-11 Interamnia
+   595 7.59179e-13 Polyxena
+   213 2.46067e-13 Lilaea
+   419 8.03400e-13 Aurelia
+   335 7.04369e-13 Roberta
+   114 8.40927e-13 Kassandra
+   233 6.75188e-13 Asterope
+   498 5.46316e-13 Tokio
+   914 1.50358e-13 Palisana
+    44 2.74406e-13 Nysa
+   790 1.70427e-12 Pretoria
+    76 2.43198e-12 Freia
+   420 7.99905e-13 Bertholda
+   106 2.00532e-13 Dione
+   130 4.48540e-12 Elektra
+    13 3.84892e-12 Egeria
+    87 1.63378e-11 Sylvia
+    51 1.89131e-12 Nemausa
+   773 3.88494e-13 Irmintraud
+   336 4.81633e-14 Lacadiera
+    60 5.01030e-14 Echo
+    79 1.63029e-13 Eurynome
+    82 1.29382e-13 Alkmene
+   100 2.88966e-13 Hekate
+   113 1.04152e-13 Amalthea
+   118 4.44631e-14 Peitho
+   132 5.91539e-14 Aethra
+   172 1.57440e-13 Baucis
+   177 1.07967e-13 Irma
+   198 1.17234e-13 Ampella
+   223 1.86578e-13 Rosa
+   227 1.78937e-12 Philosophia
+   415 2.72287e-13 Palatia
+   432 4.59660e-14 Pythia
+   445 2.88314e-13 Edna
+   464 1.96792e-13 Megaira
+   465 1.75279e-13 Alekto
+   503 2.77369e-13 Evelyn
+   516 1.91375e-13 Amherstia
+   517 5.96661e-13 Edith
+   547 1.11148e-13 Praxedis
+   569 1.88207e-13 Misa
+   584 1.31286e-13 Semiramis
+   585 3.21133e-14 Bilkis
+   591 5.28876e-14 Irmgard
+   593 1.45829e-13 Titania
+   598 3.11017e-13 Octavia
+   599 3.42121e-13 Luisa
+   604 1.57001e-13 Tekmessa
+   623 3.42024e-14 Chimaera
+   667 5.80400e-13 Denise
+   680 2.75420e-13 Genoveva
+   696 2.28910e-13 Leonora
+   735 2.55669e-13 Marghanna
+   752 1.85967e-13 Sulamitis
+   778 6.95900e-14 Theobalda
+   784 1.79747e-13 Pickeringia
+   786 6.60143e-13 Bredichina
+  1107 4.36776e-13 Lictoria
+  1171 4.41909e-13 Rusthawelia
+   485 1.55050e-13 Genua
+   675 3.54505e-13 Ludmilla
+   760 2.29967e-13 Massinga
diff --git a/mycurses.cpp b/mycurses.cpp
deleted file mode 100644
index ed09f533..00000000
--- a/mycurses.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/* mycurses.cpp: really basic DOS Curses
-
-Copyright (C) 2010, Project Pluto
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.    */
-
-#include <stdio.h>
-#include <conio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <i86.h>
-#define STDSCR_DEFINED    1
-#include "mycurses.h"
-
-static int scr_xsize, scr_ysize, echo_on = 0;
-static int initial_cursor_x, initial_cursor_y;
-static char *backup_screen;
-WINDOW *stdscr;
-
-/* At present,  I don't see any actual use for curscr in this setup.
-Everything goes directly to the screen.  If,  at some point,  I attempt to
-make some more full-fledged curses clone,  I may have to reconsider.  */
-#ifdef DEFINE_CURSCR
-WINDOW *curscr;
-#endif
-
-static int get_cursor_loc( int *row, int *col);
-static int set_cursor_loc( const int row, const int col);
-static int set_cursor_mode( const int startrow, const int endrow );
-
-#define DISPMEM ((unsigned char *)0xb8000)
-
-WINDOW *resize_window( WINDOW *old, const int ysize, const int xsize)
-{
-   WINDOW *rval = (WINDOW *)calloc( 1,
-                      sizeof( WINDOW) + xsize * ysize * sizeof( attr_t));
-
-   if( rval)
-      {
-      if( old)
-         memcpy( rval, old, sizeof( WINDOW));
-      rval->xsize = xsize;
-      rval->ysize = ysize;
-      rval->curr_x = rval->curr_y = 0;
-      }
-   if( old)
-      free( old);
-   return( rval);
-}
-
-/* Once upon a time,  I had a graphics card that supported _nine_ different
-text modes.  My current,  theoretically more advanced,  card supports only
-80-wide with 25, 28,  or 50 lines.  They call this 'progress'... anyway,
-I've included all the data for the nine possible modes. */
-
-#define TOTAL_N_TEXT_MODES       9
-
-static int default_mode_index = 0;
-static const unsigned char text_mode_xsizes[TOTAL_N_TEXT_MODES] =
-                 { 80, 80, 80, 100, 80, 132, 132, 132, 132 };
-static const unsigned char text_mode_ysizes[TOTAL_N_TEXT_MODES] =
-                 { 25, 28, 50, 37, 60, 44, 50, 25, 28 };
-
-
-static void init_stdscr( void)
-{
-   const char *default_mode_text = getenv( "MYCURSES_MODE");
-
-   if( default_mode_text)
-      default_mode_index = (int)( *default_mode_text - '0');
-   resize_term( text_mode_ysizes[default_mode_index],
-                text_mode_xsizes[default_mode_index]);
-   backup_screen = (char *)malloc( scr_xsize * scr_ysize * 2);
-   memcpy( backup_screen, DISPMEM, scr_xsize * scr_ysize * 2);
-   stdscr->wrap_on = 1;
-}
-
-WINDOW *initscr( void )
-{
-   get_cursor_loc( &initial_cursor_y, &initial_cursor_x);
-   init_stdscr( );
-   return( stdscr);
-}
-
-int wmove( WINDOW *w, const int y, const int x)
-{
-   int rval = ERR;
-
-   if( x >= 0 && x < w->xsize && y >= 0 && y < w->ysize)
-      {
-      w->curr_x = x;
-      w->curr_y = y;
-      rval = 0;
-      }
-   return( rval);
-}
-
-int waddnstr( WINDOW* w, const char *str, int len)
-{
-   attr_t *dataptr = w->data + (w->curr_x + w->curr_y * w->xsize);
-   int max_out;
-
-   if( w->curr_y >= w->ysize)
-      return( -1);
-   max_out = w->xsize - w->curr_x;
-   if( w->wrap_on)
-      max_out += (w->ysize - w->curr_y - 1) * w->xsize;
-   if( len < 0)
-      len = strlen( str);
-   if( len > max_out)
-      len = max_out;
-   w->curr_x += len;
-   if( w->wrap_on)
-      while( w->curr_x > w->xsize)
-         {
-         w->curr_x -= w->xsize;
-         w->curr_y++;
-         }
-   while( *str && len--)
-      *dataptr++ = (attr_t)((unsigned char)*str++) | w->attr;
-   return( 0);
-}
-
-int waddch( WINDOW *w, const char c)
-{
-   return( waddnstr( w, &c, 1));
-}
-
-int start_color( void )
-{
-   return( 0);
-}
-
-int wclear( WINDOW *w)
-{
-   int i = w->xsize * w->ysize;
-   attr_t *tptr = w->data;
-
-   while( i--)
-      *tptr++ = 0xf20;
-   return( 0);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-attr_t curses_attrs[COLOR_PAIRS];
-
-#ifdef __cplusplus
-}
-#endif
-
-int init_pair( const short idx, const short foreground, const short background)
-{
-   if( idx >= 0 && idx < COLOR_PAIRS)
-      curses_attrs[idx] = ((attr_t)foreground << 8)
-                        | ((attr_t)background << 12);
-   return( 0);
-}
-
-int wattrset( WINDOW *w, const attr_t attr)
-{
-   w->attr = attr;
-   return( 0);
-}
-
-int wattroff( WINDOW *w, const attr_t attr)
-{
-   w->attr = (attr_t)( w->attr & ~attr);
-   return( 0);
-}
-
-int wattron( WINDOW *w, const attr_t attr)
-{
-   w->attr = (attr_t)( w->attr | attr);
-   return( 0);
-}
-
-int wrefresh_rect( const WINDOW *w, int xmin, int ymin, int xmax, int ymax)
-{
-   int y;
-
-   if( w->yoffset < 0)
-      ymin = -w->yoffset;
-   if( ymax > scr_ysize - w->yoffset)
-      ymax = scr_ysize - w->yoffset;
-   if( w->xoffset < 0)
-      xmin = -w->xoffset;
-   if( xmax > scr_xsize - w->xoffset)
-      xmax = scr_xsize - w->xoffset;
-
-   if( xmin < xmax)
-      for( y = ymin; y < ymax; y++)
-         {
-         const attr_t *tptr = w->data + y * w->xsize + xmin;
-         unsigned char *dispmem = DISPMEM
-                   + ((y + w->yoffset) * scr_xsize + (xmin + w->xoffset)) * 2;
-         const attr_t *endptr = tptr + xmax - xmin;
-
-         while( tptr != endptr)
-            {
-            *dispmem++ = (unsigned char)*tptr;
-            *dispmem++ = (unsigned char)(*tptr++ >> 8);
-            }
-         }
-   return( 0);
-}
-
-int wset_rect_attr( WINDOW *w, int xmin, int ymin, int xmax, int ymax)
-{
-   int y;
-
-   if( w->yoffset < 0)
-      ymin = -w->yoffset;
-   if( ymax > scr_ysize - w->yoffset)
-      ymax = scr_ysize - w->yoffset;
-   if( w->xoffset < 0)
-      xmin = -w->xoffset;
-   if( xmax > scr_xsize - w->xoffset)
-      xmax = scr_xsize - w->xoffset;
-
-   if( xmin < xmax)
-      for( y = ymin; y < ymax; y++)
-         {
-         attr_t *tptr = w->data + y * w->xsize + xmin;
-         attr_t *endptr = tptr + (xmax - xmin);
-
-         while( tptr != endptr)
-            {
-            *tptr = (w->attr | (*tptr & 0xff));
-            tptr++;
-            }
-         }
-   return( 0);
-}
-
-int wrefresh( const WINDOW *w)
-{
-   return( wrefresh_rect( w, 0, 0, w->xsize, w->ysize));
-}
-
-int refresh( void)
-{
-   if( !stdscr)
-      init_stdscr( );
-   set_cursor_loc( stdscr->curr_y + stdscr->yoffset,
-                   stdscr->curr_x + stdscr->xoffset);
-   return( wrefresh( stdscr));
-}
-
-int noecho( void )
-{
-   echo_on = 0;
-   return( 0);
-}
-
-int echo( void )
-{
-   echo_on = 1;
-   return( 1);
-}
-
-static int set_cursor_mode( const int startrow, const int endrow )
-{
-   union _REGS regset;
-
-   regset.h.ah = 0x01;
-   regset.h.ch = (unsigned char) startrow;
-   regset.h.cl = (unsigned char) endrow;
-   int386(0x10, &regset, &regset);
-   return( 0 );
-}
-
-static int set_cursor_loc( const int row, const int col)
-{
-   union _REGS regset;
-
-   regset.h.ah = 0x02;
-   regset.h.bh = 0;
-// regset.h.bh = SP->video_page;
-   regset.h.dh = (unsigned char) row;
-   regset.h.dl = (unsigned char) col;
-   int386( 0x10, &regset, &regset);
-   return( 0);
-}
-
-static int get_cursor_loc( int *row, int *col)
-{
-   union _REGS regset;
-
-   regset.h.ah = 0x03;
-   regset.h.bh = 0;
-// regset.h.bh = SP->video_page;
-   int386(0x10, &regset, &regset);
-   *row = regset.h.dh;
-   *col = regset.h.dl;
-   return( 0);
-}
-
-int wgetnstr( WINDOW *w, char *str, int max_len)
-{
-   int c = 0;
-   int len = 0, insert_mode = 0;
-
-   set_cursor_mode( 14, 16);
-   while( len < max_len && c != 13)
-      {
-      int x = w->curr_x, y = w->curr_y;
-
-      set_cursor_loc( y + w->yoffset, x + w->xoffset);
-      c = getch( );
-      if( !c)
-         c = getch( ) + 256;
-      if( c == ( 82 + 256))         /* Insert key */
-         {
-         insert_mode ^= 1;
-         set_cursor_mode( 14 - insert_mode * 8, 16);
-         }
-      else if( c != 13)
-         {
-         if( c != 8)
-            {
-            str[len++] = (char)c;
-            waddch( w, (char)c);
-            }
-         else if( len > 0)
-            {
-            len--;
-            str[len] = '\0';
-            x--;
-            mvwaddch( w, y, x, ' ');
-            wmove( w, y, x);
-            }
-         if( echo_on)
-            wrefresh_rect( w, x, y, x + 1, y + 1);
-         }
-      }
-   str[len] = '\0';
-   if( insert_mode)
-      set_cursor_mode( 14, 16);
-   return( 0);
-}
-
-int flushinp( void )
-{
-   while( kbhit( ))
-      getch( );
-   return( 0);
-}
-
-int resize_term( const int ysize, const int xsize)
-{
-   scr_xsize = xsize;
-   scr_ysize = ysize;
-   stdscr = resize_window( stdscr, ysize, xsize);
-#ifdef DEFINE_CURSCR
-   curscr = resize_window( curscr, ysize, xsize);
-#endif
-   return( 0);
-}
-
-int PDC_set_scrn_mode( const int new_mode)
-{
-   return( 0);
-}
-
-int endwin( void )
-{
-// set_text_mode( TEXT_MODE_80x25);
-   set_text_mode( default_mode_index);
-   set_cursor_loc( initial_cursor_y, initial_cursor_x);
-   if( stdscr)
-      {
-      free( stdscr);
-      stdscr = NULL;
-      }
-#ifdef DEFINE_CURSCR
-   if( curscr)
-      {
-      free( curscr);
-      curscr = NULL;
-      }
-#endif
-   if( backup_screen)
-      {
-      memcpy( DISPMEM, backup_screen, scr_xsize * scr_ysize * 2);
-      free( backup_screen);
-      }
-   return( 0);
-}
-
-int set_text_mode( const unsigned mode)
-{
-   static const unsigned char modes[TOTAL_N_TEXT_MODES] =
-                 { 3, 3, 3, 42, 38, 34, 34, 34, 34 };
-            /* for a 16-high font, use 0x14 */
-            /* for a 14-high font, use 0x11 */
-            /* for an 8-high font, use 0x12 */
-   static const unsigned char font_sizes[TOTAL_N_TEXT_MODES] =
-                         { 0x14, 0x11, 0x12, 0, 0, 0, 0x12, 0x14, 0x11 };
-   union _REGS regset;
-
-   regset.w.ax = modes[mode];
-   int386( 0x10, &regset, &regset);
-   if( font_sizes[mode])
-      {
-      regset.h.ah = 0x11;
-      regset.h.al = font_sizes[mode];
-      regset.h.bl = 0x00;
-      int386( 0x10, &regset, &regset);
-      }
-   resize_term( text_mode_ysizes[mode], text_mode_xsizes[mode]);
-   return( 0);
-}
-
-int get_text_mode_sizes( const int mode, int *ysize, int *xsize)
-{
-   int rval = 0;
-
-   if( mode < 0 || mode >= N_TEXT_MODES)
-      rval = -1;
-   else
-      {
-      if( xsize)
-         *xsize = (int)text_mode_xsizes[mode];
-      if( ysize)
-         *ysize = (int)text_mode_ysizes[mode];
-      }
-   return( rval);
-}
-
-int putwin(WINDOW *win, FILE *filep)
-{
-   fwrite( win, sizeof( WINDOW), 1, filep);
-   fwrite( win->data, sizeof( attr_t), win->xsize * win->ysize, filep);
-   return( OK);
-}
-
-static int read_window( WINDOW *win, FILE *filep)
-{
-   fread( win, sizeof( WINDOW), 1, filep);
-   fread( win->data, sizeof( attr_t), win->xsize * win->ysize, filep);
-   return( OK);
-}
-
-WINDOW *getwin(FILE *filep)
-{
-   WINDOW temp, *rval;
-
-   fread( &temp, sizeof( WINDOW), 1, filep);
-   rval = (WINDOW *)calloc(
-            sizeof( WINDOW) + temp.xsize * temp.ysize * sizeof( attr_t), 1);
-   memcpy( rval, &temp, sizeof( WINDOW));
-   fread( rval->data, sizeof( attr_t), temp.xsize * temp.ysize, filep);
-   return( rval);
-}
-
-int scr_dump(const char *filename)
-{
-   int rval = ERR;
-
-   if( stdscr)
-      {
-      FILE *ofile = fopen( filename, "wb");
-
-      if( ofile)
-         {
-         rval = putwin( stdscr, ofile);
-         fclose( ofile);
-         }
-      }
-   return( rval);
-}
-
-int scr_restore(const char *filename)
-{
-   int rval = ERR;
-
-   if( stdscr)
-      {
-      FILE *ifile = fopen( filename, "rb");
-
-      if( ifile)
-         {
-         rval = read_window( stdscr, ifile);
-         fclose( ifile);
-         }
-      }
-   return( rval);
-}
-
-char *longname( void)
-{
-   return( "MyCurses");
-}
-
-            /* Cannibalized,  with little modification,  from PDCurses. */
-
-int curs_set( const int visibility)
-{
-    union _REGS regs;
-    int start, end;
-
-    switch (visibility)
-    {
-        case 0:  /* invisible */
-            start = 32;
-            end = 0;  /* was 32 */
-            break;
-        case 2:  /* highly visible */
-            start = 0;   /* full-height block */
-            end = 7;
-            break;
-        default:  /*' normal' visibility */
-            start = 0;
-            end = 31;
-            break;
-    }
-
-    /* if scrnmode is not set, some BIOSes hang */
-
-    regs.h.ah = 0x01;
-    regs.h.al = (unsigned char)3;
-    regs.h.ch = (unsigned char)start;
-    regs.h.cl = (unsigned char)end;
-    int386(0x10, &regs, &regs);
-
-    return 1;
-}
-
-      /* *inch functions basically copied from PDCurses: */
-
-chtype winch(WINDOW *win)
-{
-    if( !win)
-        return (chtype)ERR;
-
-    return win->data[win->curr_x + win->curr_y * win->xsize];
-}
-
-chtype inch(void)
-{
-    return winch(stdscr);
-}
-
-chtype mvinch(int y, int x)
-{
-    if (move(y, x) == ERR)
-        return (chtype)ERR;
-
-    return( winch( stdscr));
-}
-
-chtype mvwinch(WINDOW *win, int y, int x)
-{
-    if (wmove(win, y, x) == ERR)
-        return (chtype)ERR;
-
-    return( winch( win));
-}
-
-int waddchnstr(WINDOW *win, const chtype *ch, int n)
-{
-    attr_t *tptr = win->data + win->curr_x + win->curr_y * win->xsize;
-
-    if (n == -1 || n > win->xsize - win->curr_x)
-        n = win->xsize - win->curr_x;
-    if( n < 0)
-        return( ERR);
-    while( n--)
-        *tptr++ = (attr_t)*ch++;
-    return( OK);
-}
-
-#ifdef __WATCOMC__
-#define ZKEY_CLOCK  (*(long *)((long)0x46c))
-#else
-#define ZKEY_CLOCK  (*(long far *)((long)0x46c))
-#endif
-
-int napms( int n_milliseconds)
-{
-   const long t_end = ZKEY_CLOCK + (long)n_milliseconds / 55;
-   long curr_t = 0;
-
-   while( curr_t < t_end)
-      curr_t = ZKEY_CLOCK;
-   return( 0);
-}
-
-int init_color(short color, short red, short green, short blue)
-{
-   return( 0);
-}
-
-mmask_t mousemask(mmask_t ignored1, mmask_t *ignored2)
-{
-   return( (mmask_t)0);
-}
-
-bool can_change_color( void)
-{
-   return( 0);
-}
diff --git a/mycurses.h b/mycurses.h
deleted file mode 100644
index 2b5ab61f..00000000
--- a/mycurses.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Copyright (C) 2018, Project Pluto
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
-
-#include <stdio.h>      /* Required for scr_dump() & scr_restore() below   */
-
-#define attr_t       unsigned long
-
-typedef struct _win      /* definition of a window.      */
-{
-   int xsize, ysize, xoffset, yoffset;
-   int curr_x, curr_y, use_keypad, wrap_on;
-   attr_t attr;
-   attr_t data[1];
-} WINDOW;
-
-#ifndef STDSCR_DEFINED
-extern WINDOW *stdscr, *curscr;
-#endif
-
-/* Shamelessly lifted from (PD)Curses.h: */
-#ifndef FALSE
-# define FALSE 0
-#endif
-#ifndef TRUE
-# define TRUE 1
-#endif
-#ifndef NULL
-# define NULL (void *)0
-#endif
-#ifndef ERR
-# define ERR (-1)
-#endif
-#ifndef OK
-# define OK 0
-#endif
-
-typedef unsigned short chtype;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-int wmove( WINDOW *w, const int y, const int x);
-int waddch( WINDOW*w, const char c);
-int wrefresh( const WINDOW *w);
-int refresh( void);
-int start_color( void );
-int init_pair( const short idx, const short foreground, const short background);
-int wattrset( WINDOW *w, const attr_t attr);
-int wattroff( WINDOW*, const attr_t attr);
-int wattron( WINDOW*, const attr_t attr);
-int endwin( void );
-WINDOW *initscr( void );
-int noecho( void );
-int echo( void );
-int wgetnstr( WINDOW *w, char *str, int max_len);
-int wclear( WINDOW *w);
-int flushinp( void );
-int waddnstr( WINDOW* w, const char *str, int len);
-int resize_term( const int ysize, const int xsize);
-int PDC_set_scrn_mode( const int new_mode);
-WINDOW *resize_window( WINDOW *old, const int ysize, const int xsize);
-int set_text_mode( const unsigned mode);
-int get_text_mode_sizes( const int mode, int *ysize, int *xsize);
-int wset_rect_attr( WINDOW *w, int xmin, int ymin, int xmax, int ymax);
-int putwin( WINDOW *win, FILE *filep);
-WINDOW *getwin( FILE *filep);
-int scr_dump( const char *filename);
-int scr_restore( const char *filename);
-char *longname( void);
-int curs_set( const int visibility);
-chtype inch(void);
-chtype mvinch(int, int);
-chtype mvwinch(WINDOW *, int, int);
-chtype winch(WINDOW *);
-int waddchnstr(WINDOW *, const chtype *, int);
-bool can_change_color( void);
-
-#define keypad(w,flag)          (w->use_keypad = flag)
-#define attroff(attr)           wattroff( stdscr, attr )
-#define attron(attr)            wattron( stdscr, attr )
-#define attrset(attr)           wattrset( stdscr, attr )
-#define clear()                 wclear( stdscr )
-#define getnstr(str,num)        wgetnstr( stdscr, str, num )
-#define getmaxx(w)              (w)->xsize
-#define getmaxy(w)              (w)->ysize
-#define getmaxyx(w,y,x)         ( y = (w)->ysize, x = (w)->xsize )
-#define move(y,x)               wmove( stdscr, y, x )
-#define addch( c )              waddch( stdscr, c )
-#define mvaddch(y,x,c)          (move( y, x )==ERR?ERR:addch( c ))
-#define mvwaddch(w,y,x,c)       (wmove( w, y, x )==ERR?ERR:waddch( w, c ))
-#define mvaddchstr(y,x,c)       (move( y, x )==ERR?ERR:addchnstr( c, -1 ))
-#define mvaddchnstr(y,x,c,n)    (move( y, x )==ERR?ERR:addchnstr( c, n ))
-#define mvaddnstr(y,x,str,n)    (move( y, x )==ERR?ERR:addnstr( str, n ))
-#define addnstr(str, n)         waddnstr( stdscr, str, n )
-#define addstr(str)             addnstr( str, -1)
-#define mvaddstr(y,x,str)       mvaddnstr(y,x,str,-1)
-#define waddstr(w, str)         waddnstr( w, str, -1)
-#define cbreak()
-#define addchnstr( str, n)      waddchnstr( stdscr, str, n)
-int     napms(int);
-
-#ifndef STDSCR_DEFINED
-extern attr_t curses_attrs[];
-#endif
-
-#define COLOR_PAIRS        256
-#define COLOR_PAIR( X)          (curses_attrs[X])
-#define A_BLINK          0x8000
-#define A_STANDOUT       0x0800
-#define A_BOLD           0x0800
-#define A_CHARTEXT       0x00ff
-
-#define KEY_DOWN       ( 80 + 256)
-#define KEY_UP         ( 72 + 256)
-#define KEY_LEFT       ( 75 + 256)
-#define KEY_RIGHT      ( 77 + 256)
-#define KEY_C3         ( 81 + 512)
-#define KEY_NPAGE      ( 81 + 256)
-#define KEY_A3         ( 73 + 512)
-#define KEY_PPAGE      ( 73 + 256)
-#define KEY_C1         ( 79 + 512)
-#define KEY_END        ( 79 + 256)
-#define KEY_A1         ( 71 + 512)
-#define KEY_HOME       ( 71 + 256)
-#define KEY_IC         ( 82 + 256)
-      /* KEY_F( 1...12) = F1...12    */
-      /* KEY_F(13...24) = Shift-F1...12    */
-      /* KEY_F(25...36) = Ctrl-F1...12    */
-      /* KEY_F(37...48) = Alt-F1...12    */
-
-#define KEY_F1_TO_10(n)  (( 58 + 256)+(n)-(((n)-1)/12)*2+((n)>12 ? 15 : 0))
-#define KEY_F11_OR_12(n) ((122 + 256)+(n)-(((n)-1)/12)*10)
-#define KEY_F(n)     (((n)-1) % 12 >= 10 ? KEY_F11_OR_12(n) : KEY_F1_TO_10(n))
-#define ALT_A     ( 30 + 256)
-#define ALT_B     ( 48 + 256)
-#define ALT_C     ( 46 + 256)
-#define ALT_D     ( 32 + 256)
-#define ALT_E     ( 18 + 256)
-#define ALT_F     ( 33 + 256)
-#define ALT_G     ( 34 + 256)
-#define ALT_H     ( 35 + 256)
-#define ALT_I     ( 23 + 256)
-#define ALT_J     ( 36 + 256)
-#define ALT_K     ( 37 + 256)
-#define ALT_L     ( 38 + 256)
-#define ALT_M     ( 50 + 256)
-#define ALT_N     ( 49 + 256)
-#define ALT_O     ( 24 + 256)
-#define ALT_P     ( 25 + 256)
-#define ALT_Q     ( 16 + 256)
-#define ALT_R     ( 19 + 256)
-#define ALT_S     ( 31 + 256)
-#define ALT_T     ( 20 + 256)
-#define ALT_U     ( 22 + 256)
-#define ALT_V     ( 47 + 256)
-#define ALT_W     ( 17 + 256)
-#define ALT_X     ( 45 + 256)
-#define ALT_Y     ( 21 + 256)
-#define ALT_Z     ( 44 + 256)
-#define ALT_1     (120 + 256)
-#define ALT_2     (121 + 256)
-#define ALT_3     (122 + 256)
-#define ALT_4     (123 + 256)
-#define ALT_5     (124 + 256)
-#define ALT_6     (125 + 256)
-#define ALT_7     (126 + 256)
-#define ALT_8     (127 + 256)
-#define ALT_9     (128 + 256)
-#define ALT_0     (129 + 256)
-
-#define CTL_PAD0        (146 + 256)          /* ctl-keypad 0 */
-#define CTL_PAD1        (117 + 256)          /* ctl-keypad 1 */
-#define CTL_PAD2        (145 + 256)          /* ctl-keypad 2 */
-#define CTL_PAD3        (118 + 256)          /* ctl-keypad 3 */
-#define CTL_PAD4        (115 + 256)          /* ctl-keypad 4 */
-#define CTL_PAD5        (143 + 256)          /* ctl-keypad 5 */
-#define CTL_PAD6        (116 + 256)          /* ctl-keypad 6 */
-#define CTL_PAD7        (119 + 256)          /* ctl-keypad 7 */
-#define CTL_PAD8        (141 + 256)          /* ctl-keypad 8 */
-#define CTL_PAD9        (132 + 256)          /* ctl-keypad 9 */
-
-#define CTL_LEFT        (115 + 256)   /* Control-Left-Arrow   PC only  */
-#define CTL_RIGHT       (116 + 256)   /* Control-Right-Arrow  PC only  */
-#define CTL_UP          401     /* ctl-up arrow                  */
-#define CTL_DOWN        397     /* ctl-down arrow                */
-#define CTL_INS         402     /* ctl-insert                    */
-#define ALT_DEL         419     /* alt-delete                    */
-#define ALT_INS         418     /* alt-insert                    */
-#define CTL_PGUP        (132 + 256)   /* Control-PgUp         PC only  */
-#define CTL_PGDN        (118 + 256)   /* Control-PgDn         PC only  */
-#define CTL_HOME        (119 + 256)   /* Control-Home         PC only  */
-#define CTL_END         (117 + 256)   /* Control-End          PC only  */
-#define CTL_PADCENTER   399     /* ctl-enter on keypad           */
-#define CTL_PADPLUS     400     /* ctl-plus on keypad            */
-#define CTL_PADMINUS    398     /* ctl-minus on keypad           */
-#define CTL_PADSLASH    26      /* ctl-slash on keypad... but also Ctrl-Z */
-#define CTL_PADSTAR     406     /* ctl-star on keypad            */
-#define ALT_PADPLUS     334     /* alt-plus on keypad            */
-#define ALT_PADMINUS    330     /* alt-minus on keypad           */
-#define ALT_PADSLASH    300     /* alt-slash on keypad           */
-#define ALT_PADENTER    422     /* alt-enter on keypad           */
-#define ALT_LBRACKET    282     /* alt-left bracket              */
-#define ALT_RBRACKET    283     /* alt-right bracket             */
-#define ALT_MINUS       386     /* alt-minus                     */
-#define ALT_EQUAL       387     /* alt-equal                     */
-#define ALT_HOME        407     /* alt-home                      */
-#define ALT_PGUP        409     /* alt-pgup                      */
-#define ALT_PGDN        417     /* alt-pgdn                      */
-#define ALT_END         415     /* alt-end                       */
-#define ALT_UP          408     /* alt-up arrow                  */
-#define ALT_DOWN        416     /* alt-down arrow                */
-#define ALT_RIGHT       411     /* alt-right arrow               */
-#define ALT_LEFT        413     /* alt-left arrow                */
-
-#define ZKEY_CTRL_A     1
-#define ZKEY_CTRL_B     2
-#define ZKEY_CTRL_C     3
-#define ZKEY_CTRL_D     4
-#define ZKEY_CTRL_E     5
-#define ZKEY_CTRL_F     6
-#define ZKEY_CTRL_G     7
-#define ZKEY_CTRL_H     8
-#define ZKEY_CTRL_I     9
-#define ZKEY_CTRL_J    10
-#define ZKEY_CTRL_K    11
-#define ZKEY_CTRL_L    12
-#define ZKEY_CTRL_M    13
-#define ZKEY_CTRL_N    14
-#define ZKEY_CTRL_O    15
-#define ZKEY_CTRL_P    16
-#define ZKEY_CTRL_Q    17
-#define ZKEY_CTRL_R    18
-#define ZKEY_CTRL_S    19
-#define ZKEY_CTRL_T    20
-#define ZKEY_CTRL_U    21
-#define ZKEY_CTRL_V    22
-#define ZKEY_CTRL_W    23
-#define ZKEY_CTRL_X    24
-#define ZKEY_CTRL_Y    25
-#define ZKEY_CTRL_Z    26
-#define KEY_BTAB        ( 15 + 256)
-#define ALT_COMMA       ( 51 + 256)
-#define ALT_STOP        ( 52 + 256)
-#define CTL_DEL         (147 + 256)
-#define KEY_DC          ( 83 + 256)
-#define PADENTER    13
-
-#define KEY_MOUSE       (255 + 256)
-
-#define KEY_RESIZE      (256 + 256)
-
-#define COLOR_BLACK      0
-#define COLOR_BLUE       1
-#define COLOR_GREEN      2
-#define COLOR_CYAN       3
-#define COLOR_RED        4
-#define COLOR_MAGENTA    5
-#define COLOR_YELLOW     6
-#define COLOR_WHITE      7
-
-#define COLORS 16
-
-#define TEXT_MODE_80x25          0
-#define TEXT_MODE_80x28          1
-#define TEXT_MODE_80x50          2
-#define TEXT_MODE_100x37         3
-#define TEXT_MODE_80x60          4
-#define TEXT_MODE_132x44         5
-#define TEXT_MODE_132x50         6
-#define TEXT_MODE_132x25         7
-#define TEXT_MODE_132x28         8
-
-/* with my current video card,  only the first three are supported: */
-#define N_TEXT_MODES             3
-
-
-   /* None of the following work;  they're all dummy functions */
-   /* and macros supplied to avoid compiler warnings/errors.   */
-typedef unsigned long mmask_t;
-
-int init_color(short, short, short, short);
-mmask_t mousemask(mmask_t, mmask_t *);
-
-#define BUTTON_CONTROL      0x0010  /* PDCurses */
-#define ALL_MOUSE_EVENTS        0x1fffffffL
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/nanosecs.cpp b/nanosecs.cpp
deleted file mode 100644
index 13c86eb0..00000000
--- a/nanosecs.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 2018, Project Pluto
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA. */
-
-/* 'nanoseconds_since_1970( )' returns something close to the result of
-ctime( ),  except a billion times larger and with added precision.
-Naturally,  DOS/Windows,  OS/X,  and POSIX systems each use different
-methods.
-
-   As currently coded,  the actual precision provided is 10^-7 second
-in Windows;  a millisecond with the WATCOM compiler;  and 10^-6 second
-in everything else.  But note that "true" nanosecond precision is
-possible,  if actually desired (see the NOT_CURRENTLY_IN_USE code).
-
-   The range of a 64-bit signed integer is large enough to enable
-this function to work until Friday, 2262 Apr 11 23:47:16.854775808.
-We can get an addition 292 years by using unsigned integers,  but
-it may be wiser to switch to 128-bit integers.
-
-   Note that the usual limitations apply:  no leap seconds,  and if
-the computer's time is adjusted by NTP or the user,  the result may
-actually go backward.  If you want to know what time it is,  don't
-ask a computer.  */
-
-#include <stdint.h>
-
-int64_t nanoseconds_since_1970( void);                      /* nanosecs.c */
-
-#ifdef _WIN32
-#include <windows.h>
-
-int64_t nanoseconds_since_1970( void)
-{
-   FILETIME ft;
-   const uint64_t jd_1601 = 2305813;  /* actually 2305813.5 */
-   const uint64_t jd_1970 = 2440587;  /* actually 2440587.5 */
-   const uint64_t ten_million = 10000000;
-   const uint64_t seconds_per_day = 24 * 60 * 60;
-   const uint64_t diff = (jd_1970 - jd_1601) * ten_million * seconds_per_day;
-   uint64_t decimicroseconds_since_1970;   /* i.e.,  time in units of 1e-7 seconds */
-
-   GetSystemTimeAsFileTime( &ft);
-   decimicroseconds_since_1970 = ((uint64_t)ft.dwLowDateTime |
-                                ((uint64_t)ft.dwHighDateTime << 32)) - diff;
-   return( decimicroseconds_since_1970 * (int64_t)100);
-}
-#else
-#ifdef __WATCOMC__
-#include <sys/timeb.h>
-
-int64_t nanoseconds_since_1970( void)
-{
-   struct timeb t;
-   const int64_t one_million = 1000000;
-   int64_t millisec;
-
-   ftime( &t);
-   millisec = (int64_t)t.millitm + (int64_t)1000 * (int64_t)t.time;
-   return( millisec * (int64_t)one_million);
-}
-#else      /* OS/X,  BSD,  and Linux */
-#include <sys/time.h>
-#include <unistd.h>
-
-int64_t nanoseconds_since_1970( void)
-{
-   struct timeval now;
-   const int rv = gettimeofday( &now, NULL);
-   int64_t rval;
-   const int64_t one_billion = (int64_t)1000000000;
-
-   if( !rv)
-      rval = (int64_t)now.tv_sec * one_billion
-           + (int64_t)now.tv_usec * (int64_t)1000;
-   else
-      rval = 0;
-   return( rval);
-}
-#endif
-#endif
-
-/* At one time,  I was using the following in Linux.  It gives a
-"real" precision of nanoseconds,  instead of getting microseconds
-and multiplying by 1000 (or decimicroseconds and multiplying by 100).
-However,  it does require the realtime library to be linked in...
-I leave it here in case we someday need nanosecond precision.  */
-
-#ifdef NOT_CURRENTLY_IN_USE
-int64_t nanoseconds_since_1970( void)
-{
-   struct timespec t;
-
-   clock_gettime( CLOCK_REALTIME, &t);
-   return( t.tv_sec * (int64_t)1000000000 + t.tv_nsec);
-}
-#endif    /* NOT_CURRENTLY_IN_USE */
diff --git a/nongravs.txt b/nongravs.txt
index e9449b0e..11a42107 100644
--- a/nongravs.txt
+++ b/nongravs.txt
@@ -1,4 +1,4 @@
-   Find_Orb supports (at present) seven different non-gravitational force
+   Find_Orb supports (at present) eight different non-gravitational force
 models.  More may be added later.
 
    'Solar radiation pressure (radial, 1/r^2)' is the simplest : the model
@@ -67,3 +67,11 @@ the various SRP models.  This is basically the same as the 'solar
 radiation pressure (two-parameter)' model, except with A1 constrained to
 be zero.  (In fact, you can set that model, constrain A1=0,  and get
 exactly the same result as with the Yarkovsky (A2-only) model.)
+
+   The 'delta-V' model is used almost entirely for spacecraft,  where you have
+reason to believe that the object had a change of velocity at or near a
+specific time,  and want to determine more precisely when it occurred and the
+direction and amount of the velocity change.  Select this option, and Find_Orb
+will ask for your estimate of when the maneuver occurred. Subsequent
+least-squares fits will determine the time of the maneuver and the components
+of the velocity vector,  in meters per second,  in J2000 ecliptic coordinates.
diff --git a/observer.txt b/observer.htm
similarity index 63%
rename from observer.txt
rename to observer.htm
index 23b3bf07..82cc345d 100644
--- a/observer.txt
+++ b/observer.htm
@@ -1,3 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+<HEAD>
+   <TITLE> Observer links </TITLE>
+   <link REL="icon" HREF="favicon.ico" TYPE="image/x-icon">
+   <META http-equiv=Content-Type content="text/html; charset=utf-8">
+   <META NAME="Author" CONTENT="Bill Gray">
+</head>
+<body>
+<pre>
 ; This file is used in generating pseudo-MPECs.  Text from the 'stations'
 ; part of the MPEC is searched and substrings replaced.  This allows
 ; proper diacritical marks to be inserted,  and links generated
@@ -7,25 +17,34 @@
 ; a citation describing the honoree is usually included.
 ;
  Africano                                  <a href="https://catalina.lpl.arizona.edu/about/staff/brian-africano">Africano</a>
+ Attard                                    <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=37865&amp;view=OPD'>Attard</a>
  Bacci                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=108205&amp;view=OPD">Bacci</a>
  Bamberger                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=128345&amp;view=OPD">Bamberger</a>
  Bedient                                   <a href="http://www.ifa.hawaii.edu/tops/bedient.html">Bedient</a>
+ Balam                                     <a href='https://en.wikipedia.org/wiki/David_D._Balam'>Balam</a>
  Bauer                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=19494&amp;view=OPD">Bauer</a>
  Bell                                      <a href="http://www.corvus.com/adastra2002/bell.htm">Bell</a>
- Beresford                                 <a href="http://www.adam.com.au/dberesford/">Beresford</a>
- Bernardi                                  <a href="http://www.ifa.hawaii.edu/~bernardi/">Bernardi</a>
+ Benner                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9012&amp;view=OPD">Benner</a>
+ Beresford                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=5682&amp;view=OPD">Beresford</a>
+ Bernardi                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=27983&amp;view=OPD">Bernardi</a>
  Beshore                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=196807&amp;view=OPD">Beshore</a>
  Birtwhistle                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=65100&amp;view=OPD">Birtwhistle</a>
  Bittesini                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=5299&amp;view=OPD">Bittesini</a>
  Blythe                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=17281&amp;view=OPD">Blythe</a>
  2.24-m University of Hawaii               <a href="http://www.ifa.hawaii.edu/88inch/">2.24-m University of Hawaii</a>
- Boattini                                  <a href="http://spaceguard.rm.iasf.cnr.it/tumblingstone/issues/num23/eng/boattini.html">Boattini</a>
+ Boattini                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8925&amp;view=OPD">Boattini</a>
  Borngren                                  B&ouml;rngren
+ Bolin                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=42177&amp;view=OPD">Bolin</a>
+ Borisov                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=624448&amp;view=OPD">Borisov</a>
  Bouma                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9706&amp;view=OPD">Bouma</a>
  Bressi                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6837&amp;view=OPD">Bressi</a>
+ Brozovic                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=7295&amp;view=OPD">Brozovi&#x107;</a>
  Busch                                     <a href="http://www.easysky.de/eng/author/index.htm">Busch</a>
  Buzzi                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6517&amp;view=OPD">Buzzi</a>
+ Carry                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8467&amp;view=OPD">Carry</a>
  Cikota                                    <a href="http://dalje.com/en-croatia/asteroid-named-after-croatian-capital-zagreb/250877">Cikota</a>
+ Chambers                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=547345&amp;view=OPD">Chambers</a>
+ Chastel                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=301622&amp;view=OPD">Chastel</a>
  Crni Vrh                                  &#x10c;rni Vrh
  Christensen                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=13858&amp;view=OPD">Christensen</a>
  Cremaschini                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=14062&amp;view=OPD">Cremaschini</a>
@@ -33,54 +52,73 @@
  Concari                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6671&amp;view=OPD">Concari</a>
  Cutri                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=241529&amp;view=OPD">Cutri</a>
  Dailey                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=249522&amp;view=OPD">Dailey</a>
+ de Boer                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=343412&amp;view=OPD">de Boer</a>
  Delbo                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=16250&amp;view=OPD">Delb&oacute;</a>
  Demeautis                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=14141&amp;view=OPD">Demeautis</a>
  Denisenko                                 <a href="https://en.wikipedia.org/wiki/Denis_Denisenko">Denisenko</a>
  Denneau                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=12267&amp;view=OPD">Denneau</a>
+ Durig                                     <a href='https://new.sewanee.edu/programs-of-study/physics-astronomy/faculty-staff/douglas-t-durig/'>Durig</a>
  Ernst                                     <a href="http://www.starkenburg-sternwarte.de/asteroiden/namen/7686.htm">Ernst</a>
  Fagioli                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=27959&amp;view=OPD">Fagioli</a>
+ Fairlamb                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=353429&amp;view=OPD">Fairlamb</a>
+ Fernanda                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=12993&amp;view=OPD">Fernanda</a>
  Fitzsimmons                               <a href="https://alanfitzsimmons.wordpress.com/">Fitzsimmons</a>
  Flewelling                                <a href="https://twitter.com/heatherflew">Flewelling</a>
- Flynn                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=Randyflynn&amp;view=OPD">Flynn</a>
- F\"ohring                                 F&ouml;hring
+ Flynn                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=522563&amp;view=OPD">Flynn</a>
+ Fohring                                   <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=28805&amp;view=OPD'>F&ouml;hring</a>
+ F\"ohring                                 <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=28805&amp;view=OPD'>F&ouml;hring</a>
  Foglia                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=13147&amp;view=OPD">Foglia</a>
- Fuls                                      <a href="https://catalina.lpl.arizona.edu/person/carson-fuls">Fuls</a>
+ Fuls                                      <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=22963&amp;view=OPD">Fuls</a>
  Galad                                     <a href="http://en.wikipedia.org/wiki/Adri%C3%A1n_Gal%C3%A1d">Gal&aacute;d</a>
  Galli                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6515&amp;view=OPD">Galli</a>
- Garradd                                   <a href="http://members.ozemail.com.au/~loomberah/">Garradd</a>
- Gasparovic                                <a href="https://ssd.jpl.nasa.gov/sbdb.cgi?orb=1;sstr=gasparovic">Ga&#x161;parovi&#x107;</a>
+ Garradd                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=5066&amp;view=OPD">Garradd</a>
+ Gasparovic                                <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=P%2F2017%20K3'>Ga&#x161;parovi&#x107;</a>
+ Gedek                                     <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=580123&amp;view=OPD'>Gedek</a>
  Geffert                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=17855&amp;view=OPD">Geffert</a>
  Gibbs                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=14220&amp;view=OPD">Gibbs</a>
- Gilmore                                   <a href="http://www.phys.canterbury.ac.nz/people/gilmore.shtml">Gilmore</a>
+ Gilmore                                   <a href="https://minorplanetcenter.net/db_search/show_object?object_id=2537&amp;btnG=MPC+Database+Search">Gilmore</a>
+ Giorgini                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6775&amp;view=OPD">Giorgini</a>
  Gorbovskoy                                <a href="http://www.researchgate.net/profile/E_Gorbovskoy/citations">Gorbovskoy</a>
  Grauer                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=18871&amp;view=OPD">Grauer</a>
  Grav                                      <a href="http://web.mac.com/tgrav/iWeb/Family/Welcome.html">Grav</a>
+ Green                                     <a href='https://minorplanetcenter.net/db_search/show_object?object_id=2068'>Green</a>
  Groeller                                  <a href="https://www.lpl.arizona.edu/research-scientists/hannes-gr%C3%B6ller">Gr&ouml;ller</a>
  Guido                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=120361&amp;view=OPD">Guido</a>
+ A. Hale                                   <a href='https://minorplanetcenter.net/db_search/show_object?object_id=4151&amp;btnG=MPC+Database+Search'>A. Hale</a>
  Haleakala                                 Haleakal&#x101;
  Hammergren                                <a href="http://www.eccentrix.com/members/ssp2k/ppl/profiles/drhammer.html">Hammergren</a>
+ Harmon                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8073&amp;view=OPD">Harmon</a>
+ Hasubick                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=389293&amp;view=OPD">Hasubick</a>
  Healy                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=66479&amp;view=OPD">Healy</a>
  Heinze                                    <a href="http://www.ariheinze.com/">Heinze</a>
  Hill                                      <a href="http://www.lpl.arizona.edu/~rhill/">Hill</a>
  Hoenig                                    <a href="http://www.mpifr-bonn.mpg.de/staff/shoenig/">H&ouml;nig</a>
  Holman                                    <a href="http://en.wikipedia.org/wiki/3666_Holman">Holman</a>
+ Holmes                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=5477&amp;view=OPD">Holmes</a>
  Holvorcem                                 <a href="http://sites.mpc.com.br/holvorcem/">Holvorcem</a>
  Hormuth                                   <a href="http://sternwarte-weinheim.de/widm.html#felix">Hormuth</a>
+ Huber                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=321673&amp;view=OPD">Huber</a>
+ Hudin                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=562964&amp;view=OPD">Hudin</a>
  Hui                                       <a href="http://comethunter.lamost.org/">Hui</a>
+ Husar                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=211343&amp;view=OPD">Husar</a>
  Hurtado                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=362911&amp;view=OPD">Hurtado</a>
+ Ikemura                                   <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=6661&amp;view=OPD'>Ikemura</a>
  Jahn                                      <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10340&amp;view=OPD">Jahn</a>
  N. James                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8914&amp;view=OPD">N. James</a>
  Jelinek                                   Jel&iacute;nek
+ Juric                                     <a href='https://en.wikipedia.org/wiki/Mario_Juri%C4%87'>Juri&#x107;</a>
  Kadota                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9751&amp;view=OPD">Kadota</a>
  Kavelaars                                 <a href="http://salish.dao.nrc.ca/~kavelaar/">Kavelaars</a>
- Kilmartin                                 <a href="http://www.phys.canterbury.ac.nz/people/kilmartin.shtml">Kilmartin</a>
+ Kilmartin                                 <a href="https://minorplanetcenter.net/db_search/show_object?object_id=3907&amp;btnG=MPC+Database+Search">Kilmartin</a>
  Klet                                      <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=2199&amp;view=OPD">Kle&#357;</a>
  Kn\"ofel                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=16438&amp;view=OPD">Kn&ouml;fel</a>
+ B. Koch                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=191494&amp;view=OPD">B. Koch</a>
  Korlevic                                  <a href="https://en.wikipedia.org/wiki/Korado_Korlevi%C4%87">Korlevi&#263;</a>
  Koschny                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=21686&amp;view=OPD">Koschny</a>
  Kowalski                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=7392&amp;view=OPD">Kowalski</a>
  Kniazev                                   <a href="http://www.mathpubs.com/author/Alexei+Yu.+Kniazev">Kniazev</a>
  Kubanek                                   Kub&aacute;nek
+ Kugel                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=120375&amp;view=OPD">Kugel</a>
  Kurti                                     <a href="https://www.skaw.sk">K&uuml;rti</a>
  Kusiak                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=376574&amp;view=OPD">Kusiak</a>
  Kusnirak                                  <a href="http://en.wikipedia.org/wiki/Peter_Ku%C5%A1nir%C3%A1k">Ku&#353;nir&aacute;k</a>
@@ -88,19 +126,26 @@
  Larson                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=3690&amp;view=OPD">Larson</a>
  Lazzaro                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=3602&amp;view=OPD">Lazzaro</a>
  La Canada                                 La Ca&ntilde;ada
+ Corre                                     <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9285&amp;view=OPD'>Corre</a>
  Leonard                                   <a href="https://catalina.lpl.arizona.edu/about/staff/greg-leonard">Leonard</a>
+ Linder                                    <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=4933&amp;view=OPD'>Linder</a>
  Lipunov                                   <a href="http://xray.sai.msu.su/~lipunov/">Lipunov</a>
+ Losse                                     <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=340579&amp;view=OPD'>Losse</a>
  Lovejoy                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=61342&amp;view=OPD">Lovejoy</a>
  Lowe                                      <a href="http://members.shaw.ca/andrewlowe/">Lowe</a>
  Lutkenhoner                               L&uuml;tkenh&ouml;ner
  Mainzer                                   <a href="http://science.jpl.nasa.gov/people/Mainzer/">Mainzer</a>
+ Magnier                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=343440&amp;view=OPD">Magnier</a>
+ Magri                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=95410&amp;view=OPD">Magri</a>
  Manca                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=15460&amp;view=OPD">Manca</a>
  Marinello                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=229836&amp;view=OPD">Marinello</a>
+ S. Marshall                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=32151&amp;view=OPD">S. Marshall</a>
  Masci                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=438973&amp;view=OPD">Masci</a>
  Masek                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9841&amp;view=OPD">Ma&#353;ek</a>
  Masiero                                   <a href="http://twitter.com/joemasiero">Masiero</a>
  Matson                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=73491&amp;view=OPD">Matson</a>
  Mattiazzo                                 <a href="https://www.researchgate.net/scientific-contributions/2004893480_M_Mattiazzo">Mattiazzo</a>
+ Maury                                     <a href='https://minorplanetcenter.net/db_search/show_object?object_id=3780&amp;btnG=MPC+Database+Search'>Maury</a>
  Micheli                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10277&amp;view=OPD">Micheli</a>
  Mikuz                                     Miku&#382;
  McGaha                                    <a href="http://www.3towers.com/s3towers/AboutUs.asp?section=AboutUs">McGaha</a>
@@ -108,32 +153,49 @@
  McMillan                                  <a href="http://www.lpl.arizona.edu/resources/faculty/faculty.php?nom=McMillan">McMillan</a>
  Meszaros                                  M&eacute;sz&aacute;ros
  Merida                                    M&eacute;rida
+ Naidu                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=11468&amp;view=OPD">Naidu</a>
+ Nolan                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9537&amp;view=OPD">Nolan</a>
  Nomen                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=56561&amp;view=OPD">Nomen</a>
  Nugent                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8801&amp;view=OPD">Nugent</a>
- Oca\~na                                   Oca&ntilde;a
+ Ocana                                     <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=296587&amp;view=OPD'>Oca&ntilde;a</a>
+ Oca\~na                                   <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=296587&amp;view=OPD'>Oca&ntilde;a</a>
+ Odeh                                      <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=34786&amp;view=OPD'>Odeh</a>
  Oksanen                                   <a href="http://twitter.com/#!/oksanen">Oksanen</a>
  Ondrejov                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=56561&amp;view=OPD">Ond&#345;ejov</a>
  Sanchez-Ortiz                             <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=257336&amp;view=OPD">S&aacute;nchez-Ortiz</a>
  Ortiz                                     <a href="http://en.wikipedia.org/wiki/Jos%C3%A9_Luis_Ortiz_Moreno">Ortiz</a>
- Oschin Schmidt                            <a href="https://en.wikipedia.org/wiki/Samuel_Oschin_telescope">Oschin Schmidt</a>
  Ory                                       <a href="https://en.wikipedia.org/wiki/Michel_Ory">Ory</a>
+ Oschin Schmidt                            <a href="https://en.wikipedia.org/wiki/Samuel_Oschin_telescope">Oschin Schmidt</a>
+ Ostro                                     <a href='https://minorplanetcenter.net/db_search/show_object?object_id=3169&amp;btnG=MPC+Database+Search'>Ostro</a>
  P\'al                                     <a href="http://en.scientificcommons.org/andras_pal">P&aacute;l</a>
  Pallar\'es                                Pallar&eacute;s
+ Parrott                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=200000&amp;view=OPD">Parrott</a>
+ Pearce                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=78430&amp;view=OPD">Pearce</a>
  Pelle                                     <a href="http://chez.mana.pf/~jcpelle/">Pelle</a>
+ Petrescu                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=33809&amp;view=OPD">Petrescu</a>
  Pettarin                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=7258&amp;view=OPD">Pettarin</a>
  Piani                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10573&amp;view=OPD">Piani</a>
  PinPoint                                  <a href="http://pinpoint.dc3.com/">PinPoint</a>
- Piszkesteto                               Piszk%E9s-tet&#x151;ő
- Pittichova                                <a href="http://www.ifa.hawaii.edu/~jana/jana.html">Pittichova</a>
+ Piszkesteto                               Piszk&eacute;stet&#x151;
+ Pittichova                                <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=20187&view=OPD'>Pittichov&aacute;</a>
  Pizzetti                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=233559&amp;view=OPD">Pizzetti</a>
  Pons                                      <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=7645&amp;view=OPD">Pons</a>
  Puckett                                   <a href="http://facstaff.columbusstate.edu/puckett_andrew/orbitmaster.html">Puckett</a>
  Pravec                                    <a href="http://en.wikipedia.org/wiki/Petr_Pravec">Pravec</a>
  Primak                                    <a href="http://www.facebook.com/people/Natalia-Primak/1198556290">Primak</a>
+ E. Prosperi                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=33010&amp;view=OPD">E. Prosperi</a>
+ Prystavski                                <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=335533&amp;view=OPD">Prystavski</a>
+ Ramanjooloo                               <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=41458&amp;view=OPD">Ramanjooloo</a>
  Rankin                                    <a href="http://rankinstudio.com/">Rankin</a>
+ Reddy                                     <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8068&amp;view=OPD'>Reddy</a>
+ Reszelewski                               <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=576853&amp;view=OPD'>Reszelewski</a>
  Rinner                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=23999&amp;view=OPD">Rinner</a>
  Ritchey-Chretien                          Ritchey-Chr&eacute;tien
+ J. E. Rogers                              <a href="https://minorplanetcenter.net/db_search/show_object?object_id=5517">J. E. Rogers</a>
+ Romanov                                   <a href='https://twitter.com/romanov_filipp'>Romanov</a>
+ E. V. Ryan                                <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9542&amp;view=OPD">E. V. Ryan</a>
  W. H. Ryan                                <a href="http://infohost.nmt.edu/~bryan/">W. H. Ryan</a>
+ Santana-Ros                               <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10472&amp;view=OPD'>Santana-Ros</a>
  Sarneczky                                 <a href="http://en.wikipedia.org/wiki/Kriszti%C3%A1n_S%C3%A1rneczky">S&aacute;rneczky</a>
  S\'arneczky                               <a href="http://en.wikipedia.org/wiki/Kriszti%C3%A1n_S%C3%A1rneczky">S&aacute;rneczky</a>
  Sarounova                                 &#352;arounov&aacute;
@@ -145,33 +207,44 @@
  Shelly                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=17280&amp;view=OPD">Shelly</a>
  Sherrod                                   <a href="http://www.arksky.org/pubs.htm">Sherrod</a>
  Shurpakov                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=279274&amp;view=OPD">Shurpakov</a>
+ Sicoli                                    <a href='https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=7866&amp;view=OPD'>Sicoli</a>
  Skvarc                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=89818&amp;view=OPD">Skvar&#269;</a>
  Sonnett                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=8796&amp;view=OPD">Sonnett</a>
  Sostero                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9878&amp;view=OPD">Sostero</a>
+ Spratt                                    <a href='https://minorplanetcenter.net/db_search/show_object?object_id=4789&amp;btnG=MPC+Database+Search'>Spratt</a>
  Stecklum                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=69295&amp;view=OPD">Stecklum</a>
  Stoss                                     <a href="http://www.starkenburg-sternwarte.de/asteroiden/namen/7689.htm">Stoss</a>
  Tancredi                                  <a href="http://www.anii.org.uy/cvuy/SNI2008/Ciencias%20Naturales%20y%20Exactas/Ciencias%20F%C3%ADsicas/Gonzalo%20TANCREDI%20Machado.pdf">Tancredi</a>
+ Tanga                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9715&amp;view=OPD">Tanga</a>
+ P. Taylor                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9286&amp;view=OPD">P. Taylor</a>
  Tesi                                      <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=15817&amp;view=OPD">Tesi</a>
  Testa                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=11667&amp;view=OPD">Testa</a>
  Tholen                                    <a href="http://www.ifa.hawaii.edu/faculty/tholen/">Tholen</a>
- Ticha, J                                  <a href="https://www.klet.org/en/klenot-staff-members">Tich&aacute;, J</a>
- Tichy, M                                  <a href="https://www.klet.org/en/klenot-staff-members">Tich&#253;, M</a>
+ Ticha                                     <a href="https://www.klet.org/en/klenot-staff-members">Tich&aacute;</a>
+ Tichy                                     <a href="https://www.klet.org/en/klenot-staff-members">Tich&#253;</a>
  Tlatov                                    <a href="http://www.iau.org/administration/membership/individual/674/">Tlatov</a>
  Thuillot                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=18568&amp;view=OPD">Thuillot</a>
  Tombaugh                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=1604&amp;view=OPD">Tombaugh</a>
  Tombelli                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9904&amp;view=OPD">Tombelli</a>
  Tonry                                     <a href="http://www.ifa.hawaii.edu/~jt/">Tonry</a>
+ Vaduvescu                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=36340&amp;view=OPD">Vaduvescu</a>
  Veran                                     V&eacute;ran
  Veres                                     <a href="https://scienceandtechnology.jpl.nasa.gov/people/P_Veres">Vere&#x161;</a>
  Veillet                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=16984&amp;view=OPD">Veillet</a>
+ Venditti                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=45752&amp;view=OPD">Venditti</a>
+ Virkki                                    <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10278&amp;view=OPD">Virkki</a>
  Visnjan                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=17853&amp;view=OPD">Vi&#353;njan</a>
  Vorobjov                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=4858&amp;view=OPD">Vorobjov</a>
  Wainscoat                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9725&amp;view=OPD">Wainscoat</a>
  Watters                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=133009&amp;view=OPD">Watters</a>
  Wells                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=72834&amp;view=OPD">Wells</a>
  Weryk                                     <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=9281&amp;view=OPD">Weryk</a>
- Wierzchos                                 <a href="https://twitter.com/WierzchosKacper">Wierzcho&#347;</a>
+ Wierzchos                                 <a href='http://www.skaw.sk/interview-with-kacper-wierzchos.html'>Wierzcho&#347;</a>
  Wiggins                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=4099&amp;view=OPD">Wiggins</a>
- Q.-Z. Ye                                  <a href="http://yeqzids.github.io/">Q.-Z. Ye</a>
+ Willman                                   <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=22498&amp;view=OPD">Willman</a>
+ Q.-Z. Ye                                  <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=10280&amp;view=OPD">Q.-Z. Ye</a>
  Zolnowski                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=384815&amp;view=OPD">&#379;o&#322;nowski</a>
  Zoltowski                                 <a href="https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/?sstr=18292&amp;view=OPD">Zoltowski</a>
+</pre>
+</body>
+</html>
diff --git a/obslinks.htm b/obslinks.htm
index c51dc868..d9d1bca0 100644
--- a/obslinks.htm
+++ b/obslinks.htm
@@ -441,6 +441,7 @@
 <a name="C50"></a> C50  <a href="http://stereo.gsfc.nasa.gov/">STEREO-B</a><br>
 <a name="C51"></a> C51  <a href="http://wise.ssl.berkeley.edu/mission_sci.html">WISE</a><br>
 <a name="C55"></a> C55  <a href="https://keplerscience.arc.nasa.gov/k2-approved-programs.html">Kepler</a><br>
+<a name="C95"></a> C95  <a href="https://stiftung-astronomie.org/ueber/satino">SATINO Remote Observatory, Haute Provence</a><br>
 <a name="D"> </a>
 <a name="D25"></a> D25  <a HREF="http://www.tzecmaun.org/">Tzec Maun Observatory</a><br>
 <a name="D35"></a> D35  <a HREF="http://luss.y234.cn/">Lulin Observatory</a><br>
@@ -524,9 +525,12 @@
 <a name="K88"></a> K88  <a href="https://en.wikipedia.org/wiki/Piszkesteto_Station">GINOP-KHK, Piszk&eacute;stet&#337;</a><br>
 <a name="K93"></a> K93  <a href="http://lcogt.net/site/sutherland">Sutherland-LCOGT C</a><br>
 <a name="L"> </a>
-<a name="L01"></a> L01  <a href="https://en.wikipedia.org/wiki/Vi%C5%A1njan_Observatory">Vi&#x161;njan Observatory, Ti&#x10d;an
+<a name="L01"></a> L01  <a href="https://en.wikipedia.org/wiki/Vi%C5%A1njan_Observatory">Vi&#x161;njan Observatory, Ti&#x10d;an</a><br>
 <a name="L16"></a> L16  Stardreams Observatory, V&#x1ce;lenii de Munte<br>
 <a name="L51"></a> L51  <a href="https://en.wikipedia.org/wiki/Crimean_Astrophysical_Observatory">MARGO, Nauchnij</a><br>
+<a name="M"> </a>
+<a name="M44"></a> M44  <a href="http://www.astronomycenter.net/">Al-Khatim Observatory, Abu Dhabi</a><br>
+<a name="M49"></a> M49  <a href='https://www.ias-observatory.org/index.php/de/sternwarten/remote'>IAS Remote Observatory, Hakos</a><br>
 <a name="Q"> </a>
 <a name="Q64"></a> Q64  <a href="http://lcogt.net/site/siding-spring">Siding Spring-LCOGT B</a><br>
 <a name="Q68"></a> Q68  <a href="http://www.bluemountainsobservatory.com.au/">Blue Mountains Observatory, Leura</a><br>
diff --git a/odd_name.txt b/odd_name.txt
index cea087c4..998c4245 100644
--- a/odd_name.txt
+++ b/odd_name.txt
@@ -83,6 +83,7 @@ J069S        Jupiter LXIX = S/2017 J 8
 J070S        Jupiter LXX  = S/2017 J 9
 J071S        Jupiter LXXI = S/2018 J 2 = Ersa
 J072S        Jupiter LXXII = S/2011 J 1
+S001S        Saturn I = Mimas
 S002S        Saturn II = Enceladus
 S003S        Saturn III = Tethys
 S004S        Saturn IV = Dione
@@ -139,6 +140,22 @@ S051S        Saturn LI = Greip = S/2006 S 4
 S052S        Saturn LII = Tarqeq = S/2007 S 1
 ; Satellite 53 is an inner object:
 S053S        Saturn LIII = Aegaeon = S/2008 S 1
+
+; Approved 2022 Aug 24 :
+S054S        Saturn LIV = Gridr = S/2004 S 20
+S055S        Saturn LV = Angrboda = S/2004 S 22
+S056S        Saturn LVI = Skrymir S/2004 S 23
+S057S        Saturn LVII = Gerd = S/2004 S 25
+S058S        Saturn LVIII = S/2004 S 26
+S059S        Saturn LIX = Eggther = S/2004 S 27
+S060S        Saturn LX = S/2004 S 29
+S061S        Saturn LXI = Beli = S/2004 S 30
+S062S        Saturn LXII = Gunnlod = S/2004 S 32
+S063S        Saturn LXIII = Thiazzi = S/2004 S 33
+S064S        Saturn LXIV = S/2004 S 34
+S065S        Saturn LXV = Alvaldi = S/2004 S 35
+S066S        Saturn LXVI = Geirrod S/2004 S 38
+
 U001S        Uranus I = Ariel
 U002S        Uranus II = Umbriel
 U003S        Uranus III = Titania
@@ -185,51 +202,11 @@ P002S        Pluto II = Nix = S/2005 P 2
 P003S        Pluto III = Hydra = S/2005 P 1
 P004S        Pluto IV = Kerberos = S/2011 (134340) 1 = P4
 P005S        Pluto V = Styx = S/2012 (134340) 1 = P5
-D34340       (134340) Pluto
+D4340        (134340) Pluto
 
      WT1190F WT1190F = UDA34A3 = UW8551D = 9U01FF6
-2015-011A    2015-011A = WF839BF = MMS 1
-2015-011D    2015-011D = WF839C0 = MMS 4
-2015-011B    2015-011B = WF839C1 = MMS 2
-2015-011C    2015-011C = WF839C2 = MMS 3
-2015-011E    2015-011E = WF839C3 = MMS obj
-2015-011F    2015-011F = WF839C4 = MMS obj
-2011-037H    2011-037H = TA29DCF = Spektr-R booster
-1965-058A    1965-058A = NORAD 01458 = Vela 3a
-1969-046F    1969-046F = NORAD 03956 = Vela booster
-1972-073A    1972-073A = IMP-7 = NORAD 06197
-1973-078A    1973-078A = IMP-8 = NORAD 06893
-1983-020A    1983-020A = NORAD 13901 = ASTRON
-1983-020D    1983-020D = NORAD 20413 = ASTRON booster
-1992-044A    1992-044A = Geotail = NORAD 22049
-1995-062B    1995-062B = NORAD 23716 = ISO Rk
-1999-040B    1999-040B = Chandra = 6L05B60 = NORAD 25867
-1999-040D    1999-040D = Chandra booster = NORAD 25869
-1999-066A    1999-066A = XMM-Newton = NORAD 25989
-2000-041A    2000-041A = Cluster II-FM6 = NORAD 26410
-2000-041B    2000-041B = NORAD 26411 = Cluster II / FM6 Salsa
-2000-045A    2000-045A = NORAD 26463 = Cluster II-FM5
-2002-048A    2002-048A = NORAD 27540 = Integral
-2003-061B    2003-061B = NORAD 28141 = 5N3DAC3
-2007-004B    2007-004B = THEMIS-B = NORAD 30581 = 7W39BF5
-2007-004C    2007-004C = NORAD 30582 = Themis C = 8C186FB
-2008-051A    2008-051A = TR93D0F = IBEX = NORAD 33401
-2009-026A    2009-026A = Herschel = HPO2
-2009-026B    2009-026B = Planck
-2009-026C    2009-026C = Booster = HPO3
-2009-026D    2009-026D = Sylda = HPO1
 2009-026E    2009-026E = HPO4
 2009-026F    2009-026F = HPO5
-2009-068B    2009-068B = NORAD 36109 = WF0AEDA = WGS 3 rk = S509590
-2010-050A    2010-050A = SM999CF = Chang'e 2 probe
-2010-050B    2010-050B = RV223A9 = Chang'e 2 booster
-2011-037A    2011-037A = Spektr-R = NORAD 37755
-2012-062A    2012-062A = Star One C3 = NORAD 38991
-2013-070B    2013-070B = NORAD 39459 = UX29E26 = Chang'e 3 booster
-2013-074A    2013-074A = Gaia = NORAD 39479
-2015-007B    WE0913A = DSCOVR object = 2015-007B = NORAD 40391
-1963-039C    1963-039C = Vela 1B
-XMM          1999-066A = XMM-Newton = NORAD 25989
      RK252A5 RK252A5 = 2010 KQ = Luna ?? stage
      TJ7B205 TJ7B205 = unk Molniya
      UR29394 UR29394 = unk P=2.15d, i=12
@@ -244,40 +221,21 @@ XMM          1999-066A = XMM-Newton = NORAD 25989
      8Q58E4F 8Q58E4F = unk Molniya
      6Q0B44E 6Q0B44E = unk P=80d
      5X2744B 5X2744B = unk P=1.2d, i=23
-2015-042B    2015-042B = NORAD 40883 = Breeze-M R/B
-2007-004D    2007-004D = Themis-D = NORAD 30797
-1976-023C    SOLRAD 11A = 1976-023C = NORAD 08748 = WB31C9F = XC83E0D
-2013-024B    2013-024B = NORAD 39169 = WGS 5 Rk
-2013-041B    2013-041B = NORAD 39223 = WGS 6 Rk = S509434
-2015-019C    2015-019C = NORAD 41929 = S509356 = WJ2AD07
-     S509474 1999-066A = XMM-Newton = NORAD 25989 = S509474 = S509433
 S509559      S509559 = probable Vela
-1995-062A    1995-062A = NORAD 23715 = Infrared Space Observatory (ISO)
-1968-014B    1968-014B = NORAD 03145 = OGO 5 rk
-2012-057B    2012-057B = NORAD 38868 = Breeze-M Rkt
-2009-017B    2009-017B = NORAD 34714 = Atlas 5 Centaur R/B
-STEREO-B     2006-047B = NORAD 29511 = STEREO-B
-2015-005B    2015-005B = NORAD 40385
-1999-066B    1999-066B = XMM-Newton booster = NORAD 25990
-2007-004G    2007-004G = NORAD 30799 = Themis booster
-2016-031B    2016-031B = NORAD 41553 = S510599
-2012-003B    2012-003B = NORAD 38071 = Delta 358 booster
      YS18A5C YS18A5C = YS16534 = A104ayW = A104lks
-2016-055A    2016-055A = OSIRIS-REx
     AK17U010 1I/`Oumuamua
+0001I        1I/`Oumuamua = A/2017 U1
+0001IK17U010 1I/`Oumuamua = A/2017 U1
+0002I        2I/Borisov = C/2019 Q4
+0002IK19Q040 2I/Borisov = C/2019 Q4
+0003I        3I = C/2025 N1 (ATLAS)
+0003IK25N010 3I = C/2025 N1 (ATLAS)
      ZGBD4BF ZGBD4BF = ZJ15031 = unknown
-2018-045D    2018-045D = NORAD 43473 = Queqiao booster
      ZTF00pm ZTF00pm = ZTF01Ls
      ZTF01sS ZTF01sS = ZTF01sX = ZTF01wl
-2018-103B    2018-103B = NORAD 43846 = Chang'e 4 booster
-     JNS023  1969-046D = NORAD 03954 = Vela 5a
      C05GHG1 C05GHG1 = C04W5Q1 = C073CX1
-1964-040B    1964-040B = NORAD 00837 = Vela 2B
              [Unnamed]
-     EMM-01  2020-047A = NORAD 45918 = EMM (Hope) spacecraft
-     EMM-02  2020-047B = NORAD 45919 = EMM (Hope) booster
      TianweA 2020-049A = NORAD 45935 = Tianwen-1 spacecraft
      TianweB 2020-049B = NORAD 45936 = Tianwen-1 booster
 Perseverance 2020-052A = NORAD 45984 = Mars 2020 (Perseverance)
-2020-052B    2020-052B = NORAD 45985 = Mars 2020 (Perseverance) booster
      K20S00O 2020 SO = Surveyor 2 Centaur
diff --git a/orb_fun2.cpp b/orb_fun2.cpp
index cfce9622..3291bafd 100644
--- a/orb_fun2.cpp
+++ b/orb_fun2.cpp
@@ -80,9 +80,11 @@ static double simplex_scoring( void *icontext, const double *ivect)
 
    if( context->n_params == 2)
       {
-      herget_method( context->obs, context->n_obs, ivect[0], ivect[1],
-                           context->orbit, NULL, NULL, NULL);
-      adjust_herget_results( context->obs, context->n_obs, context->orbit);
+      if( herget_method( context->obs, context->n_obs, ivect[0], ivect[1],
+                           context->orbit, NULL, NULL, NULL))
+         return( 1e+30);
+      if( adjust_herget_results( context->obs, context->n_obs, context->orbit))
+         return( 1e+30);
       }
    else
       {
@@ -236,8 +238,11 @@ static STORED_ORBIT
    double epoch;
    double orbit[MAX_N_PARAMS];
    int n_orbit_params, force_model;
+   unsigned perturbers;
    } *stored = NULL;
 
+extern unsigned perturbers;
+
 void push_orbit( const double epoch, const double *orbit)
 {
    STORED_ORBIT *head = (STORED_ORBIT *)malloc( sizeof( STORED_ORBIT));
@@ -250,6 +255,7 @@ void push_orbit( const double epoch, const double *orbit)
       memcpy( head->orbit, orbit, n_orbit_params * sizeof( double));
       head->n_orbit_params = n_orbit_params;
       head->force_model = force_model;
+      head->perturbers = perturbers;
       stored = head;
       }
 }
@@ -267,6 +273,7 @@ int pop_orbit( double *epoch, double *orbit)
          *epoch = stored->epoch;
          n_orbit_params = stored->n_orbit_params;
          force_model = stored->force_model;
+         perturbers = stored->perturbers;
          memcpy( orbit, stored->orbit, n_orbit_params * sizeof( double));
          available_sigmas = NO_SIGMAS_AVAILABLE;
          }
@@ -523,9 +530,10 @@ int find_circular_orbits( OBSERVE FAR *obs1, OBSERVE FAR *obs2,
 
    As described at the second link,  this has maximum error of 1.5x10^-7.
 (Which isn't a problem here,  but some caution would be appropriate.)
-It's only used in early MSVCs which lack erf(),  and in OpenWATCOM.  */
+This is for older compilers lacking the C99 or C++11 standard erf(),
+such as OpenWATCOM and some early MSVCs.  */
 
-#if defined( _MSC_VER) && (_MSC_VER < 1800) || defined( __WATCOMC__)
+#if( __cplusplus < 201103L)
 double erf( double x)
 {
     const double a1 = 0.254829592, a2 = -0.284496736, a3 = 1.421413741;
@@ -723,7 +731,7 @@ double improve_along_lov( double *orbit, const double epoch, const double *lov,
    assert( x);
    score = x + n_divs;
    for( i = 0; i < n_obs; i++)
-      if( obs[i].is_included)
+      if( obs[i].is_included && obs[i].note2 != 'R')
          {
          double sigma = hypot( obs[i].posn_sigma_1, obs[i].posn_sigma_2)
                                  * 180. * 3600. / PI;
@@ -794,7 +802,7 @@ double generate_mc_variant_from_covariance( double *var_orbit,
    double rval = 0.;
 
    assert( eigenvects);
-   memcpy( var_orbit, orbit, 6 * sizeof( double));
+   memcpy( var_orbit, orbit, n_orbit_params * sizeof( double));
    for( i = 0; i < n_orbit_params; i++)
       {
       const double g_rand = gaussian_random( );
@@ -806,9 +814,6 @@ double generate_mc_variant_from_covariance( double *var_orbit,
    return( rval);
 }
 
-int text_search_and_replace( char FAR *str, const char *oldstr,
-                                     const char *newstr);   /* ephem0.cpp */
-
 const char *excluded_filename = "excluded.txt";
 
 int write_excluded_observations_file( const OBSERVE *obs, int n_obs)
@@ -847,7 +852,7 @@ int write_excluded_observations_file( const OBSERVE *obs, int n_obs)
             char time_buff[80];
 
             full_ctime( time_buff, current_jd( ), FULL_CTIME_YMD);
-            fprintf( ofile, "# %s Banned obs file written %s\n",
+            fprintf( ofile, "# %s Banned obs file written %s UTC\n",
                            reduced_desig, time_buff);
             }
          n_excluded++;
@@ -861,7 +866,8 @@ int write_excluded_observations_file( const OBSERVE *obs, int n_obs)
    return( n_excluded);
 }
 
-double automatic_outlier_rejection_limit = 3.;
+double automatic_outlier_rejection_limit;
+double default_automatic_outlier_rejection_limit = 3.;
 
 int apply_excluded_observations_file( OBSERVE *obs, const int n_obs)
 {
@@ -869,7 +875,7 @@ int apply_excluded_observations_file( OBSERVE *obs, const int n_obs)
    FILE *ifile;
    int n_excluded = 0, i;
 
-   automatic_outlier_rejection_limit = 3.;
+   automatic_outlier_rejection_limit = default_automatic_outlier_rejection_limit;
    ifile = fopen_ext( excluded_filename, "crb");
    if( ifile)
       {
diff --git a/orb_func.cpp b/orb_func.cpp
index 13017995..130cc860 100644
--- a/orb_func.cpp
+++ b/orb_func.cpp
@@ -36,23 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "pl_cache.h"
 #include "constant.h"
 
-#ifndef _MSC_VER
-         /* All non-Microsoft builds are for the console */
-   #define CONSOLE
-#endif
-
 #ifndef _WIN32
    #include <unistd.h>
 #endif
 
-#ifdef CONSOLE
-      /* In the console version of Find_Orb,  the following two functions */
-      /* get remapped to Curses functions.  In the non-interactive one,   */
-      /* they're mapped to 'do-nothings'.  See fo.cpp & find_orb.cpp.     */
-   void refresh_console( void);
-   void move_add_nstr( const int col, const int row, const char *msg, const int n_bytes);
-#endif
-
 /* MS only got around to adding 'isfinite' in VS2013 : */
 
 #if defined( _MSC_VER) && (_MSC_VER < 1800)
@@ -66,7 +53,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 int snprintf( char *string, const size_t max_len, const char *format, ...);
 #endif
 
-#ifdef __WATCOMC__
+#if( __cplusplus < 201103L)
+         /* i.e.,  pre-C99 or pre-C++11 standard,  lacking long double funcs */
 #define sqrtl sqrt
 #define powl pow
 #define fabsl fabs
@@ -138,15 +126,19 @@ int compute_available_sigmas_hash( const OBSERVE FAR *obs, const int n_obs,
 double vector3_dist( const double *a, const double *b);     /* orb_func.c */
 double euler_function( const OBSERVE FAR *obs1, const OBSERVE FAR *obs2);
 double evaluate_initial_orbit( const OBSERVE FAR *obs,      /* orb_func.c */
-                              const int n_obs, const double *orbit);
+               const int n_obs, const double *orbit, const double epoch);
 static int find_transfer_orbit( double *orbit, OBSERVE FAR *obs1,
                 OBSERVE FAR *obs2,
                 const int already_have_approximate_orbit);
+int find_central_object( const OBSERVE *obs, const double epoch_shown,
+                        const double *ivect, double *ovect);      /* elem_out.c */
+bool is_sungrazing_comet( const OBSERVE *obs, const int n_obs);  /* orb_func.c */
 double observation_rms( const OBSERVE FAR *obs);            /* elem_out.cpp */
 double compute_weighted_rms( const OBSERVE FAR *obs, const int n_obs,
                            int *n_resids);                  /* orb_func.cpp */
 double find_epoch_shown( const OBSERVE *obs, const int n_obs); /* elem_out */
 FILE *fopen_ext( const char *filename, const char *permits);   /* miscell.cpp */
+char *default_config_dir_name( char *oname, const char *iname); /* miscell.cpp */
 void rotate_state_vector_to_current_frame( double *state_vect,
                   const double epoch_shown, const int planet_orbiting,
                   char *body_frame_note);               /* elem_out.cpp */
@@ -154,7 +146,7 @@ const char *get_find_orb_text( const int index);      /* elem_out.cpp */
 void set_obs_vect( OBSERVE FAR *obs);        /* mpc_obs.h */
 double improve_along_lov( double *orbit, const double epoch, const double *lov,
           const unsigned n_params, unsigned n_obs, OBSERVE *obs);
-void adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
+int adjust_error_ellipse_for_timing_error( double *sigma_a, double *sigma_b,
          double *angle, const double vx, const double vy);   /* errors.cpp */
 void compute_error_ellipse_adjusted_for_motion( double *sigma1, double *sigma2,
                   double *posn_angle, const OBSERVE *obs,
@@ -166,6 +158,7 @@ int orbital_monte_carlo( const double *orbit, OBSERVE *obs, const int n_obs,
          const double curr_epoch, const double epoch_shown);   /* orb_func.cpp */
 void shellsort_r( void *base, const size_t n_elements, const size_t esize,
          int (*compare)(const void *, const void *, void *), void *context);
+int curses_kbhit_without_mouse( );
 
 void set_distance( OBSERVE FAR *obs, double r)
 {
@@ -329,8 +322,8 @@ long double take_rk_stepl( const long double jd, ELEMENTS *ref_orbit,
 long double take_pd89_step( const long double jd, ELEMENTS *ref_orbit,
                  const long double *ival, long double *ovals,
                  const int n_vals, const long double step);    /* runge.cpp */
-int symplectic_6( double jd, ELEMENTS *ref_orbit, double *vect,
-                                          const double dt);
+int symplectic_6( long double jd, ELEMENTS *ref_orbit, long double *vect,
+                                          const long double dt);   /* runge.cpp */
 static int is_unreasonable_orbit( const double *orbit);     /* orb_func.cpp */
 static int is_unreasonable_orbitl( const long double *orbit);
 
@@ -373,6 +366,7 @@ clock_t integration_timeout = (clock_t)0;
 #define STEP_INCREMENT 2
 #define INTEGRATION_TIMED_OUT       -3
 #define HIT_A_PLANET                -4
+#define USER_INTERRUPTED            -5
 
 static void double_to_ldouble( long double *ovals, const double *ivals,
                                           size_t n)
@@ -398,10 +392,8 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
                  / powl( STEP_INCREMENT, (integration_method ? 9. : 5.));
    static int use_encke = -1;
    long double t = t0;
-#ifdef CONSOLE
    static time_t real_time = (time_t)0;
    long double prev_t = t, last_err = 0.;
-#endif
    int n_rejects = 0, rval;
    unsigned saved_perturbers = perturbers;
    int n_steps = 0, prev_n_steps = 0;
@@ -411,6 +403,19 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
 
    assert( fabsl( t0) < 1e+9);
    assert( fabsl( t1) < 1e+9);
+   if( force_model == FORCE_MODEL_DELTA_V)
+      if( (t0 > orbit[9] && t1 < orbit[9]) || (t1 > orbit[9] && t0 < orbit[9]))
+         {                 /* integrate to time of maneuver & add delta-v */
+         size_t i;
+
+         integrate_orbitl( orbit, t0, orbit[9]);
+         for( i = 0; i < 3; i++)
+            if( t0 < t1)      /* integrating forward,  add delta-v; */
+               orbit[i + 3] += orbit[i + 6] * seconds_per_day / AU_IN_METERS;
+            else              /* integrating backward,  subtract it */
+               orbit[i + 3] -= orbit[i + 6] * seconds_per_day / AU_IN_METERS;
+         t = orbit[9];        /* now integrate from maneuver time to t2 */
+         }
    if( use_encke == -1)
       use_encke = atoi( get_environment_ptr( "ENCKE"));
    if( t0 > maximum_jd || t1 > maximum_jd
@@ -455,7 +460,6 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
             reset_of_elements_needed = 0;
             }
       n_steps++;
-#ifdef CONSOLE
       if( !(n_steps % 500) && show_runtime_messages && time( NULL) != real_time)
          {
          char buff[80];
@@ -468,7 +472,7 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
 
          if( runtime_message)
             move_add_nstr( 9, 10, runtime_message, -1);
-         sprintf( buff, "t = %.5f; %.5f to %.5f; step ",
+         snprintf_err( buff, sizeof( buff), "t = %.5f; %.5f to %.5f; step ",
                  (double)JD_TO_YEAR( t), (double)JD_TO_YEAR( t0), (double)JD_TO_YEAR( t1));
          if( fabsl( stepsize) > .1)
             snprintf_append( buff, sizeof( buff), "%.3f   ", (double)stepsize);
@@ -484,14 +488,14 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
          move_add_nstr( 10, 10, buff, -1);
          prev_n_steps = n_steps;
          real_time = time( NULL);
-         sprintf( buff, " %02d:%02d:%02d; %f; %d cached   ",
+         snprintf_err( buff, sizeof( buff), " %02d:%02d:%02d; %f; %d cached   ",
                      (int)( (real_time / 3600) % 24L),
                      (int)( (real_time / 60) % 60),
                      (int)( real_time % 60), (double)( t - prev_t),
                      n_posns_cached);
          prev_t = t;
          move_add_nstr( 11, 10, buff, -1);
-         sprintf( buff, "%d steps; %d rejected", n_steps, n_rejects);
+         snprintf_err( buff, sizeof( buff), "%d steps; %d rejected", n_steps, n_rejects);
          if( best_fit_planet_dist)
             {
             snprintf_append( buff, sizeof( buff), "; center %d, ",
@@ -499,31 +503,31 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
             format_dist_in_buff( buff + strlen( buff), best_fit_planet_dist);
             }
          if( planet_ns)
-            sprintf( buff + strlen( buff), "  tp:%ld.%09ld",
+            snprintf_append( buff, sizeof( buff), "  tp:%ld.%09ld",
                   (long)( planet_ns / (int64_t)1000000000),
                   (long)( planet_ns % (int64_t)1000000000));
-         strcat( buff, "  ");
+         strlcat_err( buff, "  ", sizeof( buff));
          move_add_nstr( 12, 10, buff, -1);
-         sprintf( buff, "last err: %.3e/%.3e  n changes: %d  ",
+         snprintf_err( buff, sizeof( buff), "last err: %.3e/%.3e  n changes: %d  ",
                         (double)last_err, (double)step_increase, n_changes);
          move_add_nstr( 13, 10, buff, -1);
          if( use_encke)
             {
-            sprintf( buff, "e = %.5f; q = ", ref_orbit.ecc);
+            snprintf_err( buff, sizeof( buff), "e = %.5f; q = ", ref_orbit.ecc);
             format_dist_in_buff( buff + strlen( buff), ref_orbit.q);
-            strcat( buff, "     ");
+            strlcat_error( buff, "     ");
             move_add_nstr( 18, 10, buff, -1);
             }
-         sprintf( buff, "Pos: %11.6f %11.6f %11.6f",
+         snprintf_err( buff, sizeof( buff), "Pos: %11.6f %11.6f %11.6f",
                      dorbit[0], dorbit[1], dorbit[2]);
          move_add_nstr( 14, 10, buff, -1);
-         sprintf( buff, "Vel: %11.6f %11.6f %11.6f",
+         snprintf_err( buff, sizeof( buff), "Vel: %11.6f %11.6f %11.6f",
                      dorbit[3], dorbit[4], dorbit[5]);
          move_add_nstr( 15, 10, buff, -1);
 #ifdef TEST_PLANET_CACHING_HASH_FUNCTION
          if( total_n_searches)
             {
-            sprintf( buff, "%ld searches; avg %.2f max %ld     ",
+            snprintf_err( buff, sizeof( buff), "%ld searches; avg %.2f max %ld     ",
                             total_n_searches,
                             (double)total_n_probes / (double)total_n_searches,
                             max_probes_required);
@@ -531,8 +535,9 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
             }
 #endif
          refresh_console( );
+         if( curses_kbhit_without_mouse( ) > 0)
+            return( USER_INTERRUPTED);
          }
-#endif
 
                /* Make sure we don't step completely past */
                /* the time t1 we want to stop at!         */
@@ -542,11 +547,9 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
 
       switch( integration_method)
          {
-#ifdef NOT_READY_FOR_LONG_DOUBLES
          case 1:
             symplectic_6( t, &ref_orbit, orbit, delta_t);
             break;
-#endif
          case 0:
          default:
             {
@@ -584,9 +587,7 @@ int integrate_orbitl( long double *orbit, const long double t0, const long doubl
                stepsize /= STEP_INCREMENT;
                reset_of_elements_needed = 1;
                }
-#ifdef CONSOLE
             last_err = err;
-#endif
             }
             break;
          }
@@ -702,8 +703,8 @@ static int is_unreasonable_orbitl( const long double *orbit)
 /* See Explanatory Supplement,  3.26, p. 135, "Gravitational Light
 Bending."  For our purposes,  what matters is the difference between
 how much the object's light is bent and how much the light of
-background stars is bent.  So we compute phi1 = angle between
-observer,  sun,  and 'result';  and phi2 = angle between observer,
+background stars is bent.  So we compute psi1 = angle between
+observer,  sun,  and 'result';  and psi2 = angle between observer,
 sun,  and background stars = 180 minus elongation of the object as
 seen by 'observer'.
 
@@ -728,7 +729,7 @@ static void light_bending( const double *observer, double *result)
    double p[3], plen, xprod[3], dir[3], dlen;
    const double olen = vector3_length( observer);
    const double rlen = vector3_length( result);
-   double phi1, phi2, bending;
+   double psi1, psi2, bending;
 
    for( i = 0; i < 3; i++)
       p[i] = result[i] - observer[i];
@@ -736,7 +737,7 @@ static void light_bending( const double *observer, double *result)
    if( plen < 1e-10)  /* don't do light-bending over really */
       return;         /* short/meaningless distances */
    vector_cross_product( xprod, observer, result);
-   vector_cross_product( dir, xprod, p);
+   vector_cross_product( dir, p, xprod);
    dlen = vector3_length( dir);
    if( !dlen)
       return;
@@ -744,9 +745,9 @@ static void light_bending( const double *observer, double *result)
       dir[i] /= dlen;
      /* "dir" is now a unit vector perpendicular to p,  aimed away */
      /* from the sun */
-   phi1 = acose( dot_product( result, observer) / (rlen * olen));
-   phi2 = acose( dot_product( p, observer) / (plen * olen));
-   bending = bend_factor * (tan( phi2 / 2.) - tan( phi1 / 2.));
+   psi1 = acose( dot_product( result, observer) / (rlen * olen));
+   psi2 = acose( dot_product( p, observer) / (plen * olen));
+   bending = bend_factor * (tan( psi2 / 2.) - tan( psi1 / 2.));
    bending *= plen;
    for( i = 0; i < 3; i++)
       result[i] += bending * dir[i];
@@ -828,13 +829,13 @@ static int set_locs_extended( const double *orbit, const double epoch_jd,
                        OBSERVE FAR *obs, const int n_obs,
                        const double epoch2, double *orbit2)
 {
-   int i, pass, rval = 0;
+   int i, pass, rval = is_unreasonable_orbit( orbit);
 
-   if( is_unreasonable_orbit( orbit))
+   if( rval)
       {
       if( debug_level)
-         debug_printf( "Unreasonable orbit provided to set_locs_extended: %s\n",
-                        obs->packed_id);
+         debug_printf( "Unreasonable orbit (%d) provided to set_locs_extended: %s\n",
+                        rval, obs->packed_id);
       return( -9);
       }
 
@@ -928,8 +929,16 @@ int set_locs( const double *orbit, const double t0, OBSERVE FAR *obs,
 
 double observation_rms( const OBSERVE FAR *obs)
 {
-   const double d_dec = obs->computed_dec - obs->dec;
-   const double d_ra  = (obs->computed_ra  - obs->ra) * cos( obs->computed_dec);
+   double d_dec = obs->computed_dec - obs->dec;
+   double d_ra  = (obs->computed_ra  - obs->ra) * cos( obs->computed_dec);
+
+   if( !obs->posn_sigma_theta)
+      {
+      if( obs->posn_sigma_1 > 900000.)    /* no dec reported;  RA only */
+         d_dec = 0.;
+      if( obs->posn_sigma_2 > 900000.)    /* no RA reported;  dec only */
+         d_ra = 0.;
+      }
 
    return( hypot( d_dec, d_ra) * 3600. * 180. / PI);
 }
@@ -1097,7 +1106,7 @@ static int find_transfer_orbit( double *orbit, OBSERVE FAR *obs1,
                   (i || already_have_approximate_orbit) ? "" : " Using new method");
       }
 
-   while( diff_squared > target_diff * target_diff && max_iterations--)
+   while( diff_squared > target_diff * target_diff && --max_iterations)
       {
       double delta[4][3], discr;
       unsigned pass;
@@ -1235,7 +1244,7 @@ int extended_orbit_fit( double *orbit, OBSERVE *obs, int n_obs,
    int i, j, rval = 0, n_resids;
    int n_selected;
    const int n_params = (int)( fit_type & 0xf);
-   double orbit_at_epoch[MAX_N_PARAMS];
+   double orbit_at_epoch[MAX_N_PARAMS], torbit[MAX_N_PARAMS];
    void *lsquare;
    double *resids, *slopes;
    double params[MAX_N_PARAMS];
@@ -1243,12 +1252,11 @@ int extended_orbit_fit( double *orbit, OBSERVE *obs, int n_obs,
    OBSERVE obs1, obs2;
 
    obs += drop_excluded_obs( obs, &n_obs);
-   n_resids = 2 * n_obs + MAX_CONSTRAINTS;
-   resids = (double *)calloc( n_resids * (n_params + 1), sizeof( double));
-   slopes = resids + n_resids;
    for( i = n_selected = 0; i < n_obs; i++)
       if( obs[i].flags & OBS_IS_SELECTED)
          n_selected++;
+   obs1 = obs[0];
+   obs2 = obs[n_obs - 1];
    if( n_selected == 2)
       {
       for( i = n_selected = 0; i < n_obs; i++)
@@ -1261,21 +1269,26 @@ int extended_orbit_fit( double *orbit, OBSERVE *obs, int n_obs,
             n_selected++;
             }
       }
-   else
-      {
-      obs1 = obs[0];
-      obs2 = obs[n_obs - 1];
-      }
-   integrate_orbit( orbit, epoch, obs1.jd);
+   memcpy( torbit, orbit, n_orbit_params * sizeof( double));
+   rval = integrate_orbit( torbit, epoch, obs1.jd);
+   if( rval)
+      return( rval);
+
+   n_resids = 2 * n_obs + MAX_CONSTRAINTS;
+   resids = (double *)calloc( n_resids * (n_params + 1), sizeof( double));
+   slopes = resids + n_resids;
    for( i = -1; i < n_params; i++)
       {
       for( j = 0; j < n_params; j++)
          params[j] = 0.;
       if( i >= 0)
          params[i] = -delta_val;
-      rval = find_parameterized_orbit( orbit, params, obs1, obs2,
+      rval = find_parameterized_orbit( torbit, params, obs1, obs2,
                      fit_type, 0);
-      set_locs_extended( orbit, obs1.jd, obs, n_obs, epoch, orbit_at_epoch);
+      if( !rval)
+         rval = set_locs_extended( torbit, obs1.jd, obs, n_obs, epoch, orbit_at_epoch);
+      if( rval)
+         return( rval);
       for( j = 0; j < n_obs; j++)
          if( obs[j].is_included)
             {
@@ -1324,12 +1337,16 @@ int extended_orbit_fit( double *orbit, OBSERVE *obs, int n_obs,
       for( i = 0; i < n_params; i++)
          params[i] /= rescale_adjustment;
       }
-   rval = find_parameterized_orbit( orbit, params, obs1, obs2,
+   rval = find_parameterized_orbit( torbit, params, obs1, obs2,
                      fit_type, 0);
-   set_locs_extended( orbit, obs1.jd, obs, n_obs, epoch, orbit_at_epoch);
+   if( !rval)
+      set_locs_extended( torbit, obs1.jd, obs, n_obs, epoch, orbit_at_epoch);
+   if( rval)
+      return( rval);
             /* Except we really want to return the orbit at epoch : */
-   memcpy( orbit_at_epoch, orbit, n_orbit_params * sizeof( double));
-   integrate_orbit( orbit, obs1.jd, epoch);
+   memcpy( orbit_at_epoch, torbit, n_orbit_params * sizeof( double));
+   rval = integrate_orbit( torbit, obs1.jd, epoch);
+   memcpy( orbit, torbit, n_orbit_params * sizeof( double));
    return( rval);
 }
 
@@ -1436,7 +1453,7 @@ int search_for_trial_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
                  const double r1, double *angle_param)
 {
    int rval = 0;
-   unsigned i, n_minima = 0;
+   unsigned i;
    const unsigned n_divisions = 10;
    double best_found = 0., best_rms_found = 0.;
    double rms[3];
@@ -1488,7 +1505,6 @@ int search_for_trial_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
                }
             debug_printf( "Iteration %u: x=%f, rms %f\n", iteration, new_x, new_rms);
             }
-         n_minima++;
          }
       }
    find_trial_orbit( orbit, obs, n_obs, r1, best_found);
@@ -1632,7 +1648,7 @@ double find_sr_dist( const double fraction)
    return( sr_roots[n_sr_ranges * 2 - 1]);         /* maxed out */
 }
 
-int find_nth_sr_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
+int find_nth_sr_orbit( sr_orbit_t *orbit, OBSERVE FAR *obs, int n_obs,
                             const int orbit_number)
 {
    int rval = 0;
@@ -1648,7 +1664,6 @@ int find_nth_sr_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
       {
       double rand1 = haltonize( (unsigned)orbit_number + 1, 2);
       const double rand2 = haltonize( (unsigned)orbit_number + 1, 3);
-      double dist = 0.;
       int i;
 
       if( !orbit_number)
@@ -1679,12 +1694,13 @@ int find_nth_sr_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
                debug_printf( "Root %d: %f\n", i, sr_roots[i]);
             }
          }
-            /* We give 'rand1' a slight bias toward lower values. */
-            /* It will still be in the range 0 <= rand1 < 1.      */
-      rand1 = rand1 * (1. + rand1) / 2.;
-      dist = find_sr_dist( rand1);
+            /* We give 'rparam' a slight bias toward lower values. */
+            /* It will still be in the range 0 <= rparam < 1.      */
+      orbit->rparam = rand1 * (1. + rand1) / 2.;
+      orbit->vparam = 2 * rand2 - 1.;
       fail_on_hitting_planet = true;
-      rval = find_trial_orbit( orbit, obs, n_obs, dist, 2. * rand2 - 1.);
+      rval = find_trial_orbit( orbit->orbit, obs, n_obs,
+                    find_sr_dist( orbit->rparam), orbit->vparam);
       fail_on_hitting_planet = false;
       }
    return( rval);
@@ -1692,13 +1708,13 @@ int find_nth_sr_orbit( double *orbit, OBSERVE FAR *obs, int n_obs,
 
 static int sr_orbit_compare( const void *a, const void *b)
 {
-   const double *ta = (const double *)a;
-   const double *tb = (const double *)b;
+   const sr_orbit_t *ta = (const sr_orbit_t *)a;
+   const sr_orbit_t *tb = (const sr_orbit_t *)b;
 
-   return( (ta[6] > tb[6]) ? 1 : -1);
+   return( (ta->score > tb->score) ? 1 : -1);
 }
 
-int get_sr_orbits( double *orbits, OBSERVE FAR *obs,
+int get_sr_orbits( sr_orbit_t *orbits, OBSERVE FAR *obs,
                const unsigned n_obs, const unsigned starting_orbit,
                const unsigned max_orbits, const double max_time,
                const double noise_in_sigmas, const int writing_sr_elems)
@@ -1706,20 +1722,20 @@ int get_sr_orbits( double *orbits, OBSERVE FAR *obs,
    const clock_t end_clock =
              clock( ) + (clock_t)( max_time * (double)CLOCKS_PER_SEC);
    unsigned i, rval = 0;
-   double *tptr = orbits;
+   sr_orbit_t *tptr = orbits;
 
    INTENTIONALLY_UNUSED_PARAMETER( noise_in_sigmas);
    for( i = 0; i < max_orbits && clock( ) < end_clock; i++)
       {
       if( !find_nth_sr_orbit( tptr, obs, n_obs, i + starting_orbit)
-                   && (n_obs == 2 || !adjust_herget_results( obs, n_obs, tptr)))
+                   && (n_obs == 2 || !adjust_herget_results( obs, n_obs, tptr->orbit)))
          {
-         tptr[6] = evaluate_initial_orbit( obs, n_obs, tptr);
-         rval++;
-         tptr += 7;
+         tptr->score = evaluate_initial_orbit( obs, n_obs, tptr->orbit, obs[0].jd);
+         tptr++;
          }
       }
-   qsort( orbits, rval, 7 * sizeof( double), sr_orbit_compare);
+   rval = (unsigned)( tptr - orbits);
+   qsort( orbits, rval, sizeof( sr_orbit_t), sr_orbit_compare);
    if( writing_sr_elems)
       for( i = 0; i < rval; i++)
          {
@@ -1730,20 +1746,98 @@ int get_sr_orbits( double *orbits, OBSERVE FAR *obs,
 
          elements_filename = "sr_elems.txt";
          append_elements_to_element_file = (i ? 1 : 0);
-         set_locs( orbits, obs[0].jd, obs, n_obs);
-         write_out_elements_to_file( orbits, obs[0].jd,
+         set_locs( orbits[i].orbit, obs[0].jd, obs, n_obs);
+         write_out_elements_to_file( orbits[i].orbit, obs[0].jd,
                   find_epoch_shown( obs, n_obs),
                   obs, n_obs, "", 5,
                   1, ELEM_OUT_NO_COMMENT_DATA | ELEM_OUT_PRECISE_MEAN_RESIDS);
-         orbits += 7;
          append_elements_to_element_file = curr_append;
          elements_filename = tname;
          }
    return( rval);
 }
 
+static bool is_valid_sr_orbit( const sr_orbit_t *orbit)
+{
+   return( orbit->rparam > 0. && orbit->rparam < 1.
+                  && orbit->vparam > -1. && orbit->vparam < 1.);
+}
+
+static void possible_sr_improvement( const sr_orbit_t *added, sr_orbit_t *orb1, sr_orbit_t *orb2)
+{
+   if( orb1->score > orb2->score)
+      {
+      sr_orbit_t *tptr = orb1;
+
+      orb1 = orb2;
+      orb2 = tptr;
+      }
+   if( added->score < orb2->score)
+      *orb2 = *added;
+}
+
+static void improve_sr_pair( sr_orbit_t *orb1, sr_orbit_t *orb2,
+               OBSERVE FAR *obs, const unsigned n_obs,
+               const double noise_in_sigmas, const int writing_sr_elems)
+{
+   sr_orbit_t orb3;
+
+   INTENTIONALLY_UNUSED_PARAMETER( noise_in_sigmas);
+   INTENTIONALLY_UNUSED_PARAMETER( writing_sr_elems);
+// if( !is_valid_sr_orbit( orb1) || !is_valid_sr_orbit( orb2))
+      debug_printf( "%f, %f;  %f, %f wrong\n",
+               orb1->rparam, orb1->vparam,
+               orb2->rparam, orb2->vparam);
+   orb3.rparam = (orb1->rparam + orb2->rparam) / 2.;
+   orb3.vparam = (orb1->vparam + orb2->vparam) / 2.;
+   fail_on_hitting_planet = true;
+   if( !find_trial_orbit( orb3.orbit, obs, n_obs,
+                       find_sr_dist( orb3.rparam), orb3.vparam))
+      {
+      double yneg, ypos, a, b;
+      sr_orbit_t orb4;
+
+      orb3.score = evaluate_initial_orbit( obs, n_obs, orb3.orbit, obs[0].jd);
+      yneg = orb1->score - orb3.score;
+      ypos = orb2->score - orb3.score;
+      a = (ypos + yneg) / 2.;
+      b = ypos - a;
+      orb4.score = 1e+20;
+      if( a > 0.)     /* can minimize along this 'parabola' */
+         {
+         const double t = -b / (2. * a);
+
+         orb4.rparam = orb3.rparam + t * (orb2->rparam - orb3.rparam);
+         orb4.vparam = orb3.vparam + t * (orb2->vparam - orb3.vparam);
+         if( is_valid_sr_orbit( &orb4) && !find_trial_orbit( orb4.orbit,
+                                 obs, n_obs, find_sr_dist( orb4.rparam), orb4.vparam))
+            orb4.score = evaluate_initial_orbit( obs, n_obs, orb4.orbit, obs[0].jd);
+         }
+      debug_printf( "Scores %f, %f -> %f, %f\n", orb1->score, orb2->score, orb3.score, orb4.score);
+      possible_sr_improvement( &orb3, orb1, orb2);
+      possible_sr_improvement( &orb4, orb1, orb2);
+      }
+   fail_on_hitting_planet = false;
+}
+
+int improve_sr_orbits( sr_orbit_t *orbits, OBSERVE FAR *obs,
+               const unsigned n_obs, const unsigned n_orbits,
+               const double noise_in_sigmas, const int writing_sr_elems)
+{
+   unsigned i, j;
+
+   i = rand( ) % n_orbits;
+   j = rand( ) % (n_orbits - 1);
+   j = (j + i + 1) % n_orbits;        /* makes sure i != j */
+   improve_sr_pair( orbits + i, orbits + j, obs, n_obs,
+                           noise_in_sigmas, writing_sr_elems);
+   return( 0);
+}
+
+
 static inline void compute_sr_sigmas( const double *sr_orbits,
                const unsigned n_orbits, const double epoch,
+               const int planet_orbiting,
                const double epoch_shown)
 {
    unsigned i;
@@ -1751,21 +1845,20 @@ static inline void compute_sr_sigmas( const double *sr_orbits,
    double sigmas[MONTE_N_ENTRIES];
    FILE *monte_file;
    char filename[100];
-   const int planet_orbiting = 0;      /* heliocentric only,  at least for now */
    ELEMENTS elem0;
 
    elem0.major_axis = elem0.ecc = 0.;     /* just to avoid uninitialized  */
    for( i = 0; i < n_orbits; i++)         /* variable warnings            */
       {
-      double orbit[6];
+      double orbit[MAX_N_PARAMS];
       ELEMENTS elem;
 
       memset( &elem, 0, sizeof( ELEMENTS));
       elem.gm = SOLAR_GM;
-      memcpy( orbit, sr_orbits + 6 * i, 6 * sizeof( double));
+      memcpy( orbit, sr_orbits + n_orbit_params * i, n_orbit_params * sizeof( double));
       integrate_orbit( orbit, epoch, epoch_shown);
-      calc_classical_elements( &elem, orbit, epoch_shown, 1);
-      add_monte_orbit( monte_data, &elem, i);
+      find_relative_orbit( epoch_shown, orbit, &elem, planet_orbiting);
+      add_monte_orbit( monte_data, &elem, orbit, i);
       if( !i)
          elem0 = elem;
       }
@@ -1791,25 +1884,6 @@ static OBSERVE *get_real_arc( OBSERVE *obs, int *n_obs,
 
 #define RAD2SEC (180. * 3600. / PI)
 
-int adjust_herget_results( OBSERVE FAR *obs, int n_obs, double *orbit)
-{
-   int n_found, rval = 0;
-
-   obs = get_real_arc( obs, &n_obs, &n_found);
-   if( n_found < 2)   /* must have at least two obs */
-      rval = -2;
-   else if( is_unreasonable_orbit( orbit))
-      rval = -3;
-   else
-      {
-      rval = extended_orbit_fit( orbit, obs, n_obs,
-                     FIT_FIXED_DISTANCES, obs->jd);
-      if( !rval)
-         rval = set_locs( orbit, obs->jd, obs, n_obs);
-      }
-   return( rval);
-}
-
 static double max_herget_span( const double r1, const double r2)
 {
    double rval = 100.;           /* default value */
@@ -1826,6 +1900,25 @@ static double max_herget_span( const double r1, const double r2)
    return( rval);
 }
 
+int adjust_herget_results( OBSERVE FAR *obs, int n_obs, double *orbit)
+{
+   int n_found, rval;
+
+   obs = get_real_arc( obs, &n_obs, &n_found);
+   if( n_found < 2)   /* must have at least two obs */
+      rval = -2;
+   else if( is_unreasonable_orbit( orbit))
+      rval = -3;
+   else if( obs[n_obs - 1].jd - obs[0].jd > max_herget_span( obs[n_obs - 1].r, obs->r))
+      rval = -4;
+   else
+      rval = extended_orbit_fit( orbit, obs, n_obs,
+                     FIT_FIXED_DISTANCES, obs->jd);
+   if( !rval)
+      rval = set_locs( orbit, obs->jd, obs, n_obs);
+   return( rval);
+}
+
 int herget_method( OBSERVE FAR *obs, int n_obs, double r1, double r2,
          double *orbit, double *d_r1, double *d_r2, const char *limited_orbit)
 {
@@ -1854,9 +1947,9 @@ int herget_method( OBSERVE FAR *obs, int n_obs, double r1, double r2,
    end_jd = obs[0].jd + max_herget_span( r1, r2);
             /* Look "ahead" up to maximum span : days: */
    i = n_obs - 1;
-   while( i > 0 && obs[i].jd > end_jd)
+   while( i > 1 && obs[i].jd > end_jd)
       i--;
-   if( !i)
+   if( obs[i].jd == obs[0].jd)
       return( -1);
    temp_obs2 = obs[i];
    uncertainty_parameter = 99.;
@@ -1879,9 +1972,9 @@ int herget_method( OBSERVE FAR *obs, int n_obs, double r1, double r2,
    set_distance( &temp_obs2, r2);
    runtime_message = tstr;
    if( using_pseudo_vaisala)
-      sprintf( tstr, "Vaisala %f\n", obs->solar_r);
+      snprintf_err( tstr, sizeof( tstr), "Vaisala %f\n", obs->solar_r);
    else
-      strcpy( tstr, "H/xfer orbit (1)");
+      strlcpy_error( tstr, "H/xfer orbit (1)");
                /* Compute the trial orbit in the local orbit2 array.  That */
                /* way,  if we find it's completely stupid,  we've not      */
                /* done anything to the plain old 'orbit' vector,  which    */
@@ -1895,7 +1988,7 @@ int herget_method( OBSERVE FAR *obs, int n_obs, double r1, double r2,
                /* But now that we know it's a good result,  let's copy:     */
    memcpy( orbit, orbit2, 6 * sizeof( double));
    available_sigmas = NO_SIGMAS_AVAILABLE;
-   strcpy( tstr, using_pseudo_vaisala ? "Vaisala set_locs" : "H/set_locs (1)");
+   strlcpy_error( tstr, using_pseudo_vaisala ? "Vaisala set_locs" : "H/set_locs (1)");
    if( set_locs( orbit, temp_obs1.jd, obs, n_obs))
       {
       runtime_message = NULL;
@@ -2184,7 +2277,7 @@ double evaluate_for_simplex_method( const OBSERVE FAR *obs,
                     const int planet_orbiting,
                     const char *limited_orbit)
 {
-   double rval = evaluate_initial_orbit( obs, n_obs, orbit);
+   double rval = evaluate_initial_orbit( obs, n_obs, orbit, obs[0].jd);
 
    if( limited_orbit && *limited_orbit)
       {
@@ -2292,7 +2385,7 @@ static int evaluate_limited_orbit( const double *orbit,
                                                      2. / 3.);
                            /* fall-thru   */
             case 'a':
-               constraints[rval++] = (elem.major_axis / value) - 1.;
+               constraints[rval++] = 1. / elem.major_axis - 1. / value;
                break;
             case 'n':
                value = 360. / value;         /* now value = period in days */
@@ -2302,11 +2395,15 @@ static int evaluate_limited_orbit( const double *orbit,
                constraints[rval++] = 1. / elem.major_axis - 1. / value;
                break;
             case 'A':            /* area/mass ratio */
-               if( n_orbit_params >= 7)
-                  constraints[rval++] =
-                      10000. * (orbit[6] * SOLAR_GM / SRP1AU - value);
-               if( n_orbit_params > 7)
-                  constraints[rval - 1] *= 100000.;
+               if( force_model != FORCE_MODEL_NO_NONGRAVS
+                                    && force_model != FORCE_MODEL_DELTA_V)
+                  {
+                  if( n_orbit_params >= 7)
+                     constraints[rval++] =
+                         10000. * (orbit[6] * SOLAR_GM / SRP1AU - value);
+                  if( n_orbit_params > 7)
+                     constraints[rval - 1] *= 100000.;
+                  }
                break;
             case '1': case '2': case '3':
                constraints[rval++] = 1e+10 * (orbit[6 + variable - '1'] - value);
@@ -2327,7 +2424,8 @@ static int evaluate_limited_orbit( const double *orbit,
                break;
             case 'T':
                {
-               const double tp = get_time_from_string( 0., tbuff, 0, NULL);
+               const double tp = get_time_from_string( 0., tbuff,
+                                          CALENDAR_JULIAN_GREGORIAN, NULL);
 
                if( tp)
                   constraints[rval++] = (tp - elem.perih_time) * 1e+5;
@@ -2556,8 +2654,9 @@ void compute_error_ellipse_adjusted_for_motion( double *sigma1, double *sigma2,
    *sigma1 = obs->posn_sigma_1;    /* start with "non-moving" error ellipse */
    *sigma2 = obs->posn_sigma_2;
    *posn_angle = obs->posn_sigma_theta;
-   adjust_error_ellipse_for_timing_error( sigma1, sigma2, posn_angle,
-                  dx, dy);
+   if( !(obs->flags & OBS_NO_VELOCITY))
+      adjust_error_ellipse_for_timing_error( sigma1, sigma2, posn_angle,
+                       dx, dy);
 }
 
 int get_residual_data( const OBSERVE *obs, double *xresid, double *yresid)
@@ -2587,24 +2686,27 @@ int get_residual_data( const OBSERVE *obs, double *xresid, double *yresid)
          {
          MOTION_DETAILS m;
          double sigma_1, sigma_2, tilt;
-         double cos_tilt, sin_tilt;
 
          compute_observation_motion_details( obs, &m);
          compute_error_ellipse_adjusted_for_motion( &sigma_1, &sigma_2,
                   &tilt, obs, &m);
-         cos_tilt = cos( tilt);
-         sin_tilt = sin( tilt);
-         *xresid = (cos_tilt * m.xresid - sin_tilt * m.yresid);
-         *xresid /= sigma_2;
-         *yresid = (sin_tilt * m.xresid + cos_tilt * m.yresid);
-         *yresid /= sigma_1;
+         if( sigma_1 > 0. && sigma_2 > 0.)      /* if sigmas are bogus,  leave */
+            {                                   /* xresid = yresid = 0 */
+            const double cos_tilt = cos( tilt);
+            const double sin_tilt = sin( tilt);
+
+            *xresid = (sin_tilt * m.xresid + cos_tilt * m.yresid);
+            *xresid /= sigma_1;
+            *yresid = (cos_tilt * m.xresid - sin_tilt * m.yresid);
+            *yresid /= sigma_2;
+            }
          n_residuals = 2;
          }
       }
    return( n_residuals);
 }
 
-static double vect_diff2( const double *a, const double *b)
+double vect_diff2( const double *a, const double *b)
 {
    size_t i;
    double rval = 0, delta;
@@ -2633,6 +2735,16 @@ static void output_json_matrix( FILE *ofile, const char *title, const double *ma
    fprintf( ofile, "]");
 }
 
+/* At present,  the least-squares fit involves variations along the
+state vector axes.  This may change,  probably (back to) being along the
+eigenvectors,  to provide greater stability.  */
+
+static void _tweak_orbit( double *orbit, const int axis, double tweak, const int n_params)
+{
+   INTENTIONALLY_UNUSED_PARAMETER( n_params);
+   orbit[axis] += tweak;
+}
+
 const char *monte_label[MONTE_N_ENTRIES] = {
                            "Tp", "e", "q", "Q", "1/a", "i", "M",
                            "omega", "Omega", "MOID", "H" };
@@ -2656,9 +2768,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
    double *asteroid_mass = ((limited_orbit && *limited_orbit == 'm') ?
                get_asteroid_mass( atoi( limited_orbit + 2)) : NULL);
    int n_params;
-   void *lsquare;
-   double FAR *xresids;
-   double FAR *yresids;
+   void *lsquare = NULL;
    double FAR *slopes;
    double constraint_slope[MAX_CONSTRAINTS][MAX_N_PARAMS];
    double element_slopes[MAX_N_PARAMS][MONTE_N_ENTRIES];
@@ -2676,7 +2786,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
    double scale_factor = 1.;
    double integration_length;
    double before_rms;
-   int planet_orbiting = forced_central_body, n_constraints = 0;
+   int planet_orbiting, n_constraints = 0;
    int i, j, n_skipped_obs = 0, err_code = 0;
    int n_included_observations = 0;
    bool really_use_symmetric_derivatives;
@@ -2690,9 +2800,20 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
    const double r_mult = 1e+2;
    double orbit2[MAX_N_PARAMS];
    int set_locs_rval;
+   extern double levenberg_marquardt_lambda;
    const bool saved_fail_on_hitting_planet =
                                      fail_on_hitting_planet;
 
+   if( !obs)
+      {
+      if( eigenvects)
+         {
+         free( eigenvects);
+         eigenvects = NULL;
+         }
+      *delta_vals = 0.;
+      return( 0);
+      }
    perturbers_automatically_found = always_included_perturbers;
    if( asteroid_mass)                    /* If computing an asteroid mass, */
       {                                  /* be very sure that asteroids are */
@@ -2707,16 +2828,6 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
       if( n_orbit_params == 10 && !orbit[6] && !orbit[7] && !orbit[8])
          n_params--;                /* don't try to solve for DT if we */
       }                             /* don't have approx A1, A2, A3 yet */
-   if( !obs)
-      {
-      if( eigenvects)
-         {
-         free( eigenvects);
-         eigenvects = NULL;
-         }
-      *delta_vals = 0.;
-      return( 0);
-      }
    if( get_idx1_and_idx2( n_obs, obs, &i, &j) < 3)
       return( -1);
    if( is_unreasonable_orbit( orbit))
@@ -2727,7 +2838,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
                /* We save the input orbit;  if there's an error,  we can */
                /* restore it:         */
    memcpy( original_orbit, orbit, n_orbit_params * sizeof( double));
-   sprintf( tstr, "full improvement: %f  ", JD_TO_YEAR( epoch));
+   snprintf_err( tstr, sizeof( tstr), "full improvement: %f  ", JD_TO_YEAR( epoch));
    runtime_message = tstr;
    for( i = 0; i < n_obs; i++)
       if( obs->note2 != 'R')
@@ -2769,7 +2880,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
          epoch2 = find_epoch_shown( obs, n_obs);
       }
 
-   sprintf( tstr, "fi/setting locs: %f  ", JD_TO_YEAR( epoch));
+   snprintf_err( tstr, sizeof( tstr), "fi/setting locs: %f  ", JD_TO_YEAR( epoch));
    fail_on_hitting_planet = true;
    set_locs_rval = set_locs_extended( orbit, epoch, obs, n_obs, epoch2, orbit2);
    fail_on_hitting_planet = saved_fail_on_hitting_planet;
@@ -2783,10 +2894,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
       return( -4);
       }
 
-   if( planet_orbiting == ORBIT_CENTER_AUTO)    /* select 'best' orbit center */
-      planet_orbiting = find_best_fit_planet( epoch2, orbit2, tvect);
-   else
-      get_relative_vector( epoch2, orbit2, tvect, planet_orbiting);
+   planet_orbiting = find_central_object( obs, epoch2, orbit2, tvect);
    assert( planet_orbiting >= -1);
    for( i = 0; i < 6; i++)
       {
@@ -2812,21 +2920,17 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
    rotate_state_vector_to_current_frame( orbit2, epoch2, planet_orbiting, NULL);
    calc_classical_elements( &elem, orbit2, epoch2, 1);
 
-   put_orbital_elements_in_array_form( &elem, elements_in_array);
+   put_orbital_elements_in_array_form( &elem, orbit, elements_in_array);
 
    uncertainty_parameter = 99.;
-   xresids = (double FAR *)FCALLOC( (2 + 2 * n_params) * n_obs + n_params, sizeof( double));
-   yresids = xresids + n_obs;
-   slopes = yresids + n_obs;
+   slopes = (double FAR *)FCALLOC( 2 * n_params * n_obs + n_params, sizeof( double));
 
    before_rms = compute_rms( obs, n_obs);
    if( limited_orbit && *limited_orbit == 'R')
       constraint[n_constraints++] =
               r_mult * (dotted_dist( obs + n_obs - 1) - atof( limited_orbit + 2));
 
-   sprintf( tstr, "fi/locs set: %f  ", JD_TO_YEAR( epoch));
-   for( i = 0; i < n_obs; i++)
-      get_residual_data( obs + i, xresids + i, yresids + i);
+   snprintf_err( tstr, sizeof( tstr), "fi/locs set: %f  ", JD_TO_YEAR( epoch));
 
              /* 'integration_length' = maximum time span over which we'll */
              /* be integrating,  from the working epoch to either the first */
@@ -2845,15 +2949,15 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
    orig_obs = (OBSERVE *)calloc( n_obs, sizeof( OBSERVE));
    memcpy( orig_obs, obs, n_obs * sizeof( OBSERVE));
 
-   for( i = 0; i < n_params; i++)
+   for( i = 0; !err_code && i < n_params; i++)
       {
-      const double min_change = 0.3, max_change = 3.0, optimal_change = 1.0;
+      const double min_change = 0.03, max_change = 3.0, optimal_change = 1.0;
       double low_delta = 0., high_delta = 0., low_change = 0., high_change = 0.;
       int n_iterations = 0;
       const int max_iterations = 100;
       bool keep_iterating = true;
 
-      while( keep_iterating)
+      while( !err_code && keep_iterating)
          {
          double tweaked_orbit[MAX_N_PARAMS];
          const double original_asteroid_mass = (asteroid_mass ? *asteroid_mass : 0.);
@@ -2863,7 +2967,8 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
          double worst_error_squared = 0, rescale;
          double *slope_ptr;
          double rel_orbit[MAX_N_PARAMS];
-         bool trouble_happened = false;
+         int n_tweaks = 0;
+         const int max_n_tweaks = 30;
 
                   /* for asteroid mass computations,  on first pass, */
                   /* try to set a "reasonable" delta :   */
@@ -2875,8 +2980,8 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
             if( asteroid_mass && i == 6)
                *asteroid_mass -= delta_val;
             else                    /* adjust position/velocity */
-               tweaked_orbit[i] -= delta_val;
-            sprintf( tstr, "Evaluating %d of %d : iter %d   ", i + 1,
+               _tweak_orbit( tweaked_orbit, i, -delta_val, n_params);
+            snprintf_err( tstr, sizeof( tstr), "Evaluating %d of %d : iter %d   ", i + 1,
                                     n_params, n_iterations);
             if( debug_level > 4)
                debug_printf( "About to set locs #2: delta_val %f\n", delta_val);
@@ -2894,22 +2999,28 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
                }
             if( debug_level > 4)
                debug_printf( "Second set done: %d\n", set_locs_rval);
-            if( set_locs_rval == INTEGRATION_TIMED_OUT)
-               {
-               free( xresids);
-               memcpy( orbit, original_orbit, n_orbit_params * sizeof( double));
-               runtime_message = NULL;
-               debug_printf( "Integration timeout\n");
-               return( -4);
-               }
+            if( set_locs_rval == INTEGRATION_TIMED_OUT
+                          || set_locs_rval == USER_INTERRUPTED)
+
+               err_code = set_locs_rval;
             if( set_locs_rval)      /* gonna have to try again, */
                {                    /* with a smaller tweak */
                delta_val /= 2.;
                delta_vals[i] /= 2.;
-               trouble_happened = true;
+               n_tweaks++;
+               if( n_tweaks >= max_n_tweaks)
+                  err_code = -1;
                }
             }
-            while( set_locs_rval);
+            while( set_locs_rval && !err_code);
+         if( err_code)
+            {
+            memcpy( obs, orig_obs, n_obs * sizeof( OBSERVE));
+            free( orig_obs);
+            free( slopes);
+            memcpy( orbit, original_orbit, n_orbit_params * sizeof( double));
+            return( -8);
+            }
          slope_ptr = slopes + i;
          for( j = 0; j < n_obs; j++, slope_ptr += 2 * n_params)
             get_residual_data( obs + j, slope_ptr, slope_ptr + n_params);
@@ -2923,7 +3034,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
          rotate_state_vector_to_current_frame( rel_orbit, epoch2, planet_orbiting, NULL);
          calc_classical_elements( &elem, rel_orbit, epoch2, 1);
 
-         put_orbital_elements_in_array_form( &elem, element_slopes[i]);
+         put_orbital_elements_in_array_form( &elem, rel_orbit, element_slopes[i]);
          for( j = 0; j < MONTE_N_ENTRIES; j++)
             {
             element_slopes[i][j] -= elements_in_array[j];
@@ -2952,10 +3063,19 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
             if( asteroid_mass && i == 6)
                *asteroid_mass += delta_val;
             else                    /* adjust position/velocity */
-               tweaked_orbit[i] += delta_val;
+               _tweak_orbit( tweaked_orbit, i, delta_val, n_params);
             memcpy( tstr, "Reverse   ", 10);
             fail_on_hitting_planet = true;
             set_locs_rval = set_locs( tweaked_orbit, epoch, obs, n_obs);
+            if( set_locs_rval == USER_INTERRUPTED)
+               {
+               free( slopes);
+               free( orig_obs);
+               memcpy( orbit, original_orbit, n_orbit_params * sizeof( double));
+               runtime_message = NULL;
+               debug_printf( "Interrupted full step\n");
+               return( -4);
+               }
             if( set_locs_rval)      /* fall back on simple, asymmetric method */
                {
                debug_printf( "Symmetric fail : %d\n", set_locs_rval);
@@ -2975,7 +3095,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
 
                slope_ptr[0] -= xresidual;
                slope_ptr[n_params] -= yresidual;
-/*             if( obs[j].note2 != 'R')   */
+               if( obs[j].note2 != 'R')
                   {
                   const double error_squared = slope_ptr[0] * slope_ptr[0]
                            + slope_ptr[n_params] * slope_ptr[n_params];
@@ -3000,8 +3120,6 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
                            /* evades divide-by-zero/range errors below */
          if( worst_error_in_sigmas > min_change && worst_error_in_sigmas < max_change)
             keep_iterating = false;
-         if( trouble_happened && worst_error_in_sigmas < max_change)
-            keep_iterating = false;
          if( worst_error_in_sigmas <= optimal_change)
             {
             low_delta = delta_vals[i];
@@ -3027,60 +3145,129 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
             {
             debug_printf( "Ran over iteration limit! %s\n", obs->packed_id);
             debug_printf( "Worst err %f sigmas\n", worst_error_in_sigmas);
-            free( xresids);
-            memcpy( orbit, original_orbit, n_orbit_params * sizeof( double));
+            err_code = -3;
             runtime_message = NULL;
-            return( -4);
             }
          }
       }
-   free( orig_obs);
+   memcpy( obs, orig_obs, n_obs * sizeof( OBSERVE));
+   if( err_code)
+      {
+      free( slopes);
+      free( orig_obs);
+      memcpy( orbit, original_orbit, n_orbit_params * sizeof( double));
+      return( -1);
+      }
 
-   lsquare = lsquare_init( n_params);
-   assert( lsquare);
-   if( debug_level > 1)
-      debug_printf( "Adding obs to lsquare\n");
-   for( i = 0; i < n_obs; i++)
-      if( obs[i].is_included)
+   for( int loop = atoi( get_environment_ptr( "LS_ITERATIONS")); !err_code && loop >= 0; loop--)
+      {
+      lsquare = lsquare_init( n_params);
+      assert( lsquare);
+      if( debug_level > 1)
+         debug_printf( "Adding obs to lsquare\n");
+      for( i = 0; i < n_obs; i++)
+         if( obs[i].is_included)
+            {
+            double loc_vals[22], weight = 1.;
+            double xresid, yresid, resid2;
+
+            get_residual_data( obs + i, &xresid, &yresid);
+            resid2 = xresid * xresid + yresid * yresid;
+
+            if( !(obs[i].flags & OBS_ALREADY_CORRECTED_FOR_OVEROBSERVING))
+               {
+               if( use_blunder_method == 2 && probability_of_blunder)
+                  weight = reweight_for_blunders( resid2, weight);
+               if( overobserving_time_span && overobserving_ceiling)
+                  weight *= reweight_for_overobserving( obs, n_obs, i);
+               }
+            FMEMCPY( loc_vals, slopes + i * 2 * n_params,
+                                            2 * n_params * sizeof( double));
+            lsquare_add_observation( lsquare, xresid, weight, loc_vals);
+            lsquare_add_observation( lsquare, yresid, weight, loc_vals + n_params);
+            sigma_squared += weight * weight * (resid2 + 1.);
+            }
+      i = n_included_observations * 2 - n_params;
+      if( i > 0)
+         sigma_squared /= (double)i;
+
+      if( limited_orbit)
+         for( j = 0; j < n_constraints; j++)
+            lsquare_add_observation( lsquare, constraint[j], 1.,
+                                               constraint_slope[j]);
+
+      if( debug_level > 1)
+         debug_printf( "lsquare solve\n");
+      if( !err_code)
          {
-         double loc_vals[22], weight = 1.;
-         const double xresid = xresids[i];
-         const double yresid = yresids[i];      /* all in _radians_ */
-         const double resid2 = xresid * xresid + yresid * yresid;
+         err_code = lsquare_solve( lsquare, differences);
+         if( err_code)
+            debug_printf( "Failure in lsquare_solve: %d\n", err_code);
+         }
 
-         if( !(obs[i].flags & OBS_ALREADY_CORRECTED_FOR_OVEROBSERVING))
+      for( i = 0; !err_code && i < 6 && i < n_params; i++)
+         for( j = 0; j < 6; j++)
             {
-            if( use_blunder_method == 2 && probability_of_blunder)
-               weight = reweight_for_blunders( resid2, weight);
-            if( overobserving_time_span && overobserving_ceiling)
-               weight *= reweight_for_overobserving( obs, n_obs, i);
+            double max_difference = obs->r * .7, ratio;
+
+            if( j > 2)     /* velocity component */
+               max_difference /= (obs[n_obs - 1].jd - obs[0].jd) * .5;
+            if( i == j)
+               ratio = fabs( differences[i] / max_difference);
+            else
+               ratio = 0.;
+            if( ratio > scale_factor)
+               scale_factor = ratio;
             }
-         FMEMCPY( loc_vals, slopes + i * 2 * n_params,
-                                         2 * n_params * sizeof( double));
-         lsquare_add_observation( lsquare, xresid, weight, loc_vals);
-         lsquare_add_observation( lsquare, yresid, weight, loc_vals + n_params);
-         sigma_squared += weight * weight * (resid2 + 1.);
+      if( debug_level > 1)
+         debug_printf( "lsquare computed\n");
+      memcpy( orbit2, orbit, 6 * sizeof( double));
+      for( i = 0; i < n_params && !err_code; i++)
+         {
+         if( i == 6 && asteroid_mass)
+            *asteroid_mass += differences[i] / scale_factor;
+         else
+            _tweak_orbit( orbit, i, differences[i] / scale_factor, n_params);
+         if( i == 5)    /* is our new 'orbit' state vector reasonable?  */
+            err_code = is_unreasonable_orbit( orbit);
          }
-   i = n_included_observations * 2 - n_params;
-   if( i > 0)
-      sigma_squared /= (double)i;
-
-   if( limited_orbit)
-      for( j = 0; j < n_constraints; j++)
-         lsquare_add_observation( lsquare, constraint[j], 1.,
-                                            constraint_slope[j]);
+                  /* If the orbit "blew up" or otherwise failed,  restore */
+                  /* the original version:  */
+      if( err_code || is_unreasonable_orbit( orbit))
+         debug_printf( "Failed full step: %d: %s\n", err_code, obs->packed_id);
+      snprintf_err( tstr, sizeof( tstr), "Final setting of orbit    ");
+      i = 6;      /* possibly try six half-steps */
+      do
+         {
+         if( !loop && setting_outside_of_arc)
+            err_code = set_locs( orbit, epoch, obs - n_skipped_obs, n_total_obs);
+         else
+            err_code = set_locs( orbit, epoch, obs, n_obs);
+         if( *get_environment_ptr( "HALF_STEPS"))
+            {
+            const double after_rms = compute_rms( obs, n_obs);
 
-   if( debug_level > 1)
-      debug_printf( "lsquare solve\n");
-   if( !err_code)
-      {
-      err_code = lsquare_solve( lsquare, differences);
-      if( err_code)
-         debug_printf( "Failure in lsquare_solve: %d\n", err_code);
+            snprintf_err( tstr, sizeof( tstr), "Half-stepping %d\n", 7 - i);
+            if( after_rms > before_rms * 1.5 && !limited_orbit)
+               {
+               for( j = 0; j < n_orbit_params; j++)
+                  orbit[j] = (orbit[j] + orbit2[j]) * .5;
+               i--;
+               }
+            else
+               i = 0;
+            }
+         else
+            i = 0;
+         }
+         while( !err_code && i);
+      if( loop && !err_code)
+         lsquare_free( lsquare);
       }
+   free( orig_obs);
 
    if( debug_level > 1)
-      debug_printf( "Making covar file\n");
+      debug_printf( "full_improve done\n");
    if( !err_code && *covariance_filename)
       {
       char tbuff[200];
@@ -3148,7 +3335,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
                else        /* if( pass == 3) */
                   oval = eigenvectors[j + i * n_params];
                if( pass == 1 || pass == 3)      /* correlation or eigenvects */
-                  sprintf( tbuff, "%10.6f", oval);  /* values are -1 to 1 */
+                  snprintf_err( tbuff, sizeof( tbuff), "%10.6f", oval);  /* values are -1 to 1 */
                else                             /* covar/WtW values can be */
                   put_double_in_buff( tbuff, oval);   /* huge or tiny */
                fprintf( ofile, "%s", tbuff);
@@ -3176,7 +3363,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
                   for( k = 0; k < (unsigned)n_params; k++)
                      oval += matrix_ptr[i * n_params + k] * matrix_ptr[j * n_params + k];
                   if( pass == 3)      /* eigenvects are normalized; */
-                     sprintf( tbuff, "%10.6f", oval);  /* values are -1 to 1 */
+                     snprintf_err( tbuff, sizeof( tbuff), "%10.6f", oval);  /* values are -1 to 1 */
                   else                             /* covar/WtW values can be */
                      put_double_in_buff( tbuff, oval);   /* huge or tiny */
                   fprintf( ofile, "%s", tbuff);
@@ -3258,6 +3445,7 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
             fprintf( ofile, "%s", tbuff);
             }
          }
+#ifdef NO_LONGER_NEEDED
       for( i = 6; i < n_params; i++)
          {
          double sigma;
@@ -3277,10 +3465,11 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
          else
             {           /* comet A1, A2, maybe A3 included */
             assert( n_params >= 7);
-            sprintf( title_text, "Sigma_A%d", i - 5);
+            snprintf_err( title_text, sizeof( title_text), "Sigma_A%d", i - 5);
             }
          fprintf( ofile, "\n%s: %s", title_text, tbuff);
          }
+#endif
 
       fprintf( ofile, "\n\n");
       if( limited_orbit && strstr( limited_orbit, "e="))
@@ -3297,67 +3486,12 @@ int full_improvement( OBSERVE FAR *obs, int n_obs, double *orbit,
       available_sigmas_hash = compute_available_sigmas_hash( obs, n_obs, epoch2,
                   perturbers, planet_orbiting);
       }
-   FFREE( xresids);
+   FFREE( slopes);
    lsquare_free( lsquare);
-   for( i = 0; !err_code && i < 6 && i < n_params; i++)
-      for( j = 0; j < 6; j++)
-         {
-         double max_difference = obs->r * .7, ratio;
-
-         if( j > 2)     /* velocity component */
-            max_difference /= (obs[n_obs - 1].jd - obs[0].jd) * .5;
-         if( i == j)
-            ratio = fabs( differences[i] / max_difference);
-         else
-            ratio = 0.;
-         if( ratio > scale_factor)
-            scale_factor = ratio;
-         }
-   if( debug_level > 1)
-      debug_printf( "lsquare computed\n");
-   memcpy( orbit2, orbit, 6 * sizeof( double));
-   for( i = 0; i < n_params && !err_code; i++)
-      {
-      if( i == 6 && asteroid_mass)
-         *asteroid_mass += differences[i] / scale_factor;
-      else
-         orbit[i] += differences[i] / scale_factor;
-      if( i == 5)    /* is our new 'orbit' state vector reasonable?  */
-         err_code = is_unreasonable_orbit( orbit);
-      }
-               /* If the orbit "blew up" or otherwise failed,  restore */
-               /* the original version:  */
-   if( err_code || is_unreasonable_orbit( orbit))
-      debug_printf( "Failed full step: %d: %s\n", err_code, obs->packed_id);
-   sprintf( tstr, "Final setting of orbit    ");
-   i = 6;      /* possibly try six half-steps */
-   do
-      {
-      if( setting_outside_of_arc)
-         set_locs( orbit, epoch, obs - n_skipped_obs, n_total_obs);
-      else
-         set_locs( orbit, epoch, obs, n_obs);
-      if( *get_environment_ptr( "HALF_STEPS"))
-         {
-         const double after_rms = compute_rms( obs, n_obs);
-
-         sprintf( tstr, "Half-stepping %d\n", 7 - i);
-         if( after_rms > before_rms * 1.5 && !limited_orbit)
-            {
-            for( j = 0; j < n_orbit_params; j++)
-               orbit[j] = (orbit[j] + orbit2[j]) * .5;
-            i--;
-            }
-         else
-            i = 0;
-         }
-      else
-         i = 0;
-      }
-      while( i);
 
-   if( debug_level > 1)
-      debug_printf( "full_improve done\n");
+   if( levenberg_marquardt_lambda)
+      levenberg_marquardt_lambda *=
+             (compute_rms( obs, n_obs) < before_rms ? 0.5 : 2.0);
    runtime_message = NULL;
    return( err_code);
 }
@@ -3549,7 +3683,7 @@ static double adjustment_for_orbit_likelihood( const double semimajor_axis,
       }
    else
       rval = 0.;
-   return( rval * .01);
+   return( rval * .005);
 }
 
 static int generate_orthonormal_basis( double *x, double *y, double *z, const double *ivect)
@@ -3615,21 +3749,21 @@ double distance_to_shadow( const OBSERVE FAR *obs)
 int is_interstellar = 0;
 
 double evaluate_initial_orbit( const OBSERVE FAR *obs,
-                              const int n_obs, const double *orbit)
+               const int n_obs, const double *orbit, const double epoch)
 {
    const double rms_err = compute_weighted_rms( obs, n_obs, NULL);
    double rval, rel_orbit[MAX_N_PARAMS], planet_radius_in_au;
    ELEMENTS elem;
-   int planet_orbiting = find_best_fit_planet( obs->jd,
+   int planet_orbiting = find_best_fit_planet( epoch,
                                   orbit, rel_orbit);
 
    elem.gm = get_planet_mass( planet_orbiting);
-   calc_classical_elements( &elem, rel_orbit, obs[0].jd, 1);
+   calc_classical_elements( &elem, rel_orbit, epoch, 1);
    if( planet_orbiting && elem.ecc > 1.01)
       {        /* it's flying past a planet:  re-evaluate as an */
       planet_orbiting = 0;               /* heliocentric object */
       elem.gm = get_planet_mass( 0);
-      calc_classical_elements( &elem, orbit, obs[0].jd, 1);
+      calc_classical_elements( &elem, orbit, epoch, 1);
       }
    planet_radius_in_au =
           planet_radius_in_meters( planet_orbiting) / AU_IN_METERS;
@@ -3660,8 +3794,9 @@ double evaluate_initial_orbit( const OBSERVE FAR *obs,
    if( elem.ecc < 1. && elem.q < planet_radius_in_au)
       rval += 10000.;
    if( debug_level > 4)
-      debug_printf( "Orbit with a=%f, q=%f, e=%f, i=%f: %f\n",
-            elem.major_axis, elem.q, elem.ecc, elem.incl * 180. / PI, rval);
+      debug_printf( "Orbit around %d with a=%f, q=%f, e=%f, i=%f: %f\n",
+            planet_orbiting, elem.major_axis, elem.q,
+            elem.ecc, elem.incl * 180. / PI, rval);
    return( rval);
 }
 
@@ -3672,10 +3807,8 @@ static double attempt_improvements( double *orbit, OBSERVE *obs, const int n_obs
    OBSERVE *best_obs = (OBSERVE *)calloc( n_obs, sizeof( OBSERVE));
    double temp_orbit[6];
 
-#ifdef CONSOLE
    if( show_runtime_messages)
       move_add_nstr( 14, 10, "Improving solution...        ", -1);
-#endif
    if( set_locs( orbit, obs[0].jd, obs, n_obs))
       {
       debug_printf( "Set loc fail 17\n");
@@ -3683,7 +3816,7 @@ static double attempt_improvements( double *orbit, OBSERVE *obs, const int n_obs
 
    assert( n_orbit_params == 6);
    memcpy( temp_orbit, orbit, 6 * sizeof( double));
-   curr_score = evaluate_initial_orbit( obs, n_obs, orbit);
+   curr_score = evaluate_initial_orbit( obs, n_obs, orbit, obs->jd);
    memcpy( best_obs, obs, n_obs * sizeof( OBSERVE));
    for( method = 0; method < 2; method++)
       {
@@ -3697,17 +3830,15 @@ static double attempt_improvements( double *orbit, OBSERVE *obs, const int n_obs
          {
          double score;
 
-#ifdef CONSOLE
          if( show_runtime_messages)
             {
             char msg_buff[80];
 
-            sprintf( msg_buff, "%s step: radii %f, %f",
+            snprintf_err( msg_buff, sizeof( msg_buff), "%s step: radii %f, %f",
                         (method ? "full" : "Herget"),
                         obs[0].r, obs[n_obs - 1].r);
             move_add_nstr( 14, 10, msg_buff, -1);
             }
-#endif
          if( !method)         /* doing an Herget step */
             {
             double r1 = obs[0].r, r2 = obs[n_obs - 1].r;
@@ -3719,8 +3850,9 @@ static double attempt_improvements( double *orbit, OBSERVE *obs, const int n_obs
                {
                r1 += d_r1;
                r2 += d_r2;
-               herget_method( obs, n_obs, r1, r2, temp_orbit, NULL, NULL, NULL);
-               if( adjust_herget_results( obs, n_obs, temp_orbit))
+               if( herget_method( obs, n_obs, r1, r2, temp_orbit, NULL, NULL, NULL))
+                  error_occurred = true;
+               else if( adjust_herget_results( obs, n_obs, temp_orbit))
                   error_occurred = true;
                }
             if( debug_level > 3)
@@ -3738,7 +3870,7 @@ static double attempt_improvements( double *orbit, OBSERVE *obs, const int n_obs
             {
             const double full_step_advantage = .3;
 
-            score = evaluate_initial_orbit( obs, n_obs, temp_orbit);
+            score = evaluate_initial_orbit( obs, n_obs, temp_orbit, obs->jd);
             if( method)    /* for a full-improvement step,  make the score */
                score -= full_step_advantage;         /* just a hair better */
             if( debug_level > 2)
@@ -3777,10 +3909,137 @@ static void exclude_unusable_observations( OBSERVE *obs, int n_obs)
       }
 }
 
-static inline bool is_solar_observatory( const char *mpc_code)
+bool is_sungrazing_comet( const OBSERVE *obs, const int n_obs)
 {
-   return( !strcmp( mpc_code, "249") || !strcmp( mpc_code, "C49")
-                                     || !strcmp( mpc_code, "C50"));
+   int i = 0;
+
+   while( i < n_obs && ( !strcmp( obs[i].mpc_code, "249")
+                      || !strcmp( obs[i].mpc_code, "C49")
+                      || !strcmp( obs[i].mpc_code, "PSP")
+                      || !strcmp( obs[i].mpc_code, "Goe")
+                      || !strcmp( obs[i].mpc_code, "SWF")
+                      || !strcmp( obs[i].mpc_code, "C50")))
+      i++;
+   return( i == n_obs);    /* all obs are from sungrazing comet platforms */
+}
+
+int solve_quadratic( const double a, const double b, const double c,
+                     double *low, double *high)
+{
+   const double discr = b * b - 4. * a * c;
+
+   int rval;
+
+   if( discr >= 0)
+      {
+      const double sqrt_discr = sqrt( discr);
+      if( low)
+         *low = (-b - sqrt_discr) / (2. * a);
+      if( high)
+         *high = (-b + sqrt_discr) / (2. * a);
+      rval = 1;
+      }
+   else
+      rval = 0;
+   return( rval);
+}
+
+/* Kreutz comets all have basically parabolic orbits with very similar
+perihelion directions.  They effectively "fall from infinity" from
+ecliptic longitude 102.81, latitude -35.22,  and therefore come to
+perihelion at ecliptic longitude 182.81,  latitude +35.22.  The
+perihelion distance ranges from slightly inside the sun to about 0.01 AU.
+
+   For a given perihelion distance,  the orbit will lie on a paraboloid
+of revolution around the line described by the above ecliptic lat/lon.
+In a coordinate system in which the x-axis points to the perihelion
+point,  such that the perihelion point is at (q, 0, 0), the equation for
+the paraboloid of revolution around the x-axis will be
+
+4q(q-x) = (y^2 + z^2)
+
+   One optical observation will require that the object be at a certain
+point along a ray,  starting at the observer's location and pointed
+along the RA/dec of the observation.  Let's say that,  in the rotated
+system,  the observation describes a ray
+
+x = x0 + vx * d
+y = y0 + vy * d
+z = z0 + vz * d
+
+   where (vx, vy, vz) is a unit vector and d is the distance from the
+observer to the comet.  The intersection of this ray with the above
+paraboloid will happen when
+
+4q( q - x0 - vx * d) = (y0 + vy * d)^2 + (z0 + vz * d)^2
+
+(vy^2 + vz^2) * d^2 + (2(y0 * vy + z0 * vz) + 4q * vx)d + (y0^2 + z0^2 + 4q( x0 - q))
+
+   So we have a quadratic in d.  That will give us the two distances along
+the ray that pass through the paraboloid.  (Or the quadratic will have no
+real roots,  telling us that the ray misses the paraboloid.  In that case,
+we can only return "sorry,  no such orbit is possible.")
+
+   For each distance,  we can compute (x, y, z) as given above,  and
+therefore the distance from the sun,  and therefore the speed for an object
+in a parabolic orbit v = sqrt( 2GM/r).  The direction of the velocity
+vector should bisect the vectors toward the sun and the perihelion vector
+'perih_vect' computed at the start of this exercise.  (In theory,  it could
+bisect "the long way",  resulting in a velocity vector pointed away from
+the sun.  But we rarely see Kreutz comets after perihelion;  taking the
+vector pointing toward the sun is a perfectly reasonable assumption.)
+
+   Both of the two roots will produce parabolic orbits that take the object
+from the observation point to the perihelion point (q, 0, 0).  The Kreutz
+comets tend to lie in the same plane,  but it's a little risky to rely on
+that;  there is considerable rotation around it,  and when the roots of the
+quadratic are close together (i.e.,  the "ray" described by the observation
+just barely intersects the paraboloid),  you might find that both roots
+seem plausible. Our best guide is probably just to look at the resulting
+residuals for the other observations. */
+
+double find_kreutz_orbit( OBSERVE FAR *obs, int n_obs, double *orbit,
+                       const double q)
+{
+   const double ecl_lon = 282.81 * PI / 180.;
+   const double ecl_lat = 35.22 * PI / 180.;
+   double basis[3][3], perih_vect[3], loc[3], vel[3], a, b, c, dist[2];
+   double rval = 0.;
+   size_t i;
+
+   INTENTIONALLY_UNUSED_PARAMETER( n_obs);
+   polar3_to_cartesian( perih_vect, ecl_lon, ecl_lat);
+   generate_orthonormal_basis( basis[0], basis[1], basis[2], perih_vect);
+   for( i = 0; i < 3; i++)
+      {
+      loc[i] = dot_product( basis[i], obs->obs_posn);
+      vel[i] = dot_product( basis[i], obs->vect);
+      }
+   a = vel[1] * vel[1] + vel[2] * vel[2];
+   b = 2. * (loc[1] * vel[1] + loc[2] * vel[2]) + 4. * q * vel[0];
+   c = loc[1] * loc[1] + loc[2] * loc[2] + 4. * q * (loc[0] - q);
+   if( solve_quadratic( a, b, c, dist, dist + 1))
+      {
+      static int choice;
+
+      debug_printf( "distances %f %f\n", dist[0], dist[1]);
+      rval = dist[choice ^= 1];
+      if( orbit)
+         {
+         double r, renormalize;
+
+         for( i = 0; i < 3; i++)
+            orbit[i] = obs->obs_posn[i] + rval * obs->vect[i];
+         r = vector3_length( orbit);
+         for( i = 0; i < 3; i++)
+            orbit[i + 3] = perih_vect[i] - orbit[i] / r;
+         renormalize = sqrt( 2. * SOLAR_GM / r);
+         renormalize /= vector3_length( orbit + 3);
+         for( i = 0; i < 3; i++)
+            orbit[i + 3] *= renormalize;
+         }
+      }
+   return( rval);
 }
 
 static double find_sungrazer_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
@@ -3807,12 +4066,16 @@ static double find_sungrazer_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
          if( !find_parabolic_orbit( obs, n_obs, temp_orbit, direction))
             {
             ELEMENTS elem;
+            double ecliptic_lon, ecliptic_lat;
+
             double score;
 
             elem.gm = SOLAR_GM;
             calc_classical_elements( &elem, temp_orbit, obs[0].jd, 1);
-            score = 10. * fabs( elem.ecc - 1.) + fabs( elem.incl * 180. / PI - 144.);
-            if( best_score > score)
+            get_periapsis_loc( &ecliptic_lon, &ecliptic_lat, &elem);
+            score = fabs( ecliptic_lon - 282.81 * PI / 180.)
+                  + fabs( ecliptic_lat - 35.22 * PI / 180.);
+            if( best_score > score && elem.incl > PI / 2.)
                {
                best_score = score;
                memcpy( orbit, temp_orbit, 6 * sizeof( double));
@@ -3874,6 +4137,71 @@ static double only_one_position_available( OBSERVE FAR *obs,
    return( epoch);
 }
 
+/* Initial orbit determination and 'extending' the orbit currently
+don't use radar data,  and don't use observations marked as OBS_DONT_USE.
+The simplest way to force this is to temporarily sort such observations
+to the end of the array,  and temporarily decrease the number of
+observations accordingly. */
+
+static int sort_unused_obs_to_end( OBSERVE *obs, int n_obs)
+{
+   int sort_radar_last = SORT_OBS_RADAR_LAST, n_radar_obs = 0;
+
+   shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, &sort_radar_last);
+   while( n_obs && (obs[n_obs - 1].note2 == 'R' || (obs[n_obs - 1].flags & OBS_DONT_USE)))
+      {
+      n_obs--;                   /* temporarily remove radar obs */
+      n_radar_obs++;
+      }
+   return( n_radar_obs);
+}
+
+static int compare_doubles( const void *aptr, const void *bptr, void *unused_context)
+{
+   const double a = *(double *)aptr, b = *(double *)bptr;
+
+   INTENTIONALLY_UNUSED_PARAMETER( unused_context);
+   return( a > b ? 1 : -1);
+}
+
+/* Of the 'acceptable' variant orbits,  we'd like to have the nominal
+one be a 'median' one.  So we look through the variant state vectors
+and determine the median x, y, and z values at epoch.  Then we look for
+the orbit closest to that point,  and make that the nominal one.  */
+
+static void find_median_orbit( double *sr_orbits, const unsigned n_sr_orbits)
+{
+   unsigned i, j, best_idx = 0;
+   double median[3], *temp_array = (double *)calloc( n_sr_orbits, sizeof( double));
+   double best_dist2;
+
+   for( i = 0; i < 3; i++)
+      {
+      for( j = 0; j < n_sr_orbits; j++)
+         temp_array[j] = sr_orbits[j * 6 + i];
+      shellsort_r( temp_array, n_sr_orbits, sizeof( double), compare_doubles, NULL);
+      median[i] = temp_array[n_sr_orbits / 2];
+      }
+   free( temp_array);
+   for( i = 0; i < n_sr_orbits; i++)
+      {
+      const double dist2 = vect_diff2( median, sr_orbits + i * 6);
+
+      if( !i || best_dist2 > dist2)
+         {
+         best_dist2 = dist2;
+         best_idx = i;
+         }
+      }
+   for( i = 0; i < 6; i++)
+      {
+      const double swap_val = sr_orbits[i];
+
+      sr_orbits[i] = sr_orbits[i + best_idx * 6];
+      sr_orbits[i + best_idx * 6] = swap_val;
+      }
+}
+
 #define INITIAL_ORBIT_NOT_YET_FOUND       -2
 #define INITIAL_ORBIT_FAILED              -1
 #define INITIAL_ORBIT_FOUND                0
@@ -3889,13 +4217,10 @@ unsigned max_n_sr_orbits;
 double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
 {
    int i;
-   int start = 0, n_radar_obs = 0;
-   int sort_radar_last = SORT_OBS_RADAR_LAST;
+   int start = 0, n_radar_obs;
    bool dawn_based_observations = false;
    double arclen;
-#ifdef CONSOLE
    char msg_buff[80];
-#endif
    const double acceptable_score_limit = 5.;
    double best_score = 1e+50;
    double best_orbit[6], orbit_epoch;
@@ -3920,6 +4245,8 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
       obs++;
       n_obs--;
       }
+   n_radar_obs = sort_unused_obs_to_end( obs, n_obs);
+   n_obs -= n_radar_obs;
                /* We may have eliminated all observations,  or all */
                /* but one... in which case we do this :            */
    if( n_obs <= 1 || force_bogus_orbit)
@@ -3932,9 +4259,7 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
    full_improvement( NULL, 0, NULL, 0., NULL, 0, 0.);
    for( i = 0; i < n_obs; i++)      /* solely to ensure a non-zero r */
       obs[i].r = 1.;
-   for( i = 0; i < n_obs && is_solar_observatory( obs[i].mpc_code); i++)
-      ;
-   if( i == n_obs)      /* all obs are from SOHO or STEREOs */
+   if( is_sungrazing_comet( obs, n_obs))
       return( find_sungrazer_orbit( obs, n_obs, orbit));
 
    perturbers = AUTOMATIC_PERTURBERS | always_included_perturbers;
@@ -3950,46 +4275,50 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
 
    if( max_time)
       integration_timeout = clock( ) + (clock_t)( max_time * CLOCKS_PER_SEC);
-   if( obs[n_obs - 1].jd - obs[0].jd < MAX_SR_SPAN)
-      n_sr_orbits = get_sr_orbits( sr_orbits, obs, n_obs, 0, max_n_sr_orbits, .5, 0., 0);
-   else
+   if( obs[n_obs - 1].jd - obs[0].jd > MAX_SR_SPAN)
       n_sr_orbits = 0;     /* don't bother with SR for long time spans */
-   i = 0;
-   while( (unsigned)i < n_sr_orbits && sr_orbits[i * 7 + 6] < .7)
-      i++;
-   n_sr_orbits = i;        /* cut orbits down to the "reasonable" ones */
-   while( n_sr_orbits > 3 && n_sr_orbits <= 10)
+   else
       {
-      unsigned n = get_sr_orbits( sr_orbits + 7 * n_sr_orbits, obs, n_obs,
-                        rand( ), max_n_sr_orbits - n_sr_orbits, .5, 0., 0);
+      sr_orbit_t *sr = (sr_orbit_t *)calloc( max_n_sr_orbits,
+                                       sizeof( sr_orbit_t));
 
+      n_sr_orbits = get_sr_orbits( sr, obs, n_obs, 0, max_n_sr_orbits, .5, 0., 0);
       i = 0;
-      while( (unsigned)i < n_sr_orbits + n && sr_orbits[i * 7 + 6] < .7)
+      while( (unsigned)i < n_sr_orbits && sr[i].score < .7)
          i++;
       n_sr_orbits = i;        /* cut orbits down to the "reasonable" ones */
-      }
-   if( n_sr_orbits > 10)   /* got at least ten "reasonable" SR orbits; */
-      {               /* accept the SR solution */
-      const double epoch_shown = find_epoch_shown( obs, n_obs);
-
-              /* SR orbits are stored in seven doubles,  including a score. */
-      for( i = 1; i < (int)n_sr_orbits; i++)  /* Shift 'em to remove the score. */
-         memmove( sr_orbits + i * 6, sr_orbits + i * 7, 6 * sizeof( double));
-      memcpy( orbit, sr_orbits, 6 * sizeof( double));
-      compute_sr_sigmas( sr_orbits, n_sr_orbits, obs[0].jd, epoch_shown);
-      available_sigmas_hash = compute_available_sigmas_hash( obs, n_obs,
-                  epoch_shown, perturbers, 0);
-      set_locs( orbit, obs[0].jd, obs, n_obs);
-      integration_timeout = 0;
-      return( obs[0].jd);
-      }
+      while( n_sr_orbits > 3 && n_sr_orbits <= 10)
+         {
+         unsigned n = get_sr_orbits( sr + n_sr_orbits, obs, n_obs,
+                           rand( ), max_n_sr_orbits - n_sr_orbits, .5, 0., 0);
 
-   shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, &sort_radar_last);
-   while( n_obs && (obs[n_obs - 1].note2 == 'R' || (obs[n_obs - 1].flags & OBS_DONT_USE)))
-      {
-      n_obs--;                   /* temporarily remove radar obs */
-      n_radar_obs++;
+         i = 0;
+         while( (unsigned)i < n_sr_orbits + n && sr[i].score < .7)
+            i++;
+         n_sr_orbits = i;        /* cut orbits down to the "reasonable" ones */
+         }
+      if( n_sr_orbits > 10)   /* got at least ten "reasonable" SR orbits; */
+         {               /* accept the SR solution */
+         const double epoch_shown = find_epoch_shown( obs, n_obs);
+
+         orbit_epoch = obs[0].jd;
+         for( i = 0; i < (int)n_sr_orbits; i++)
+            memcpy( sr_orbits + i * 6, sr[i].orbit, 6 * sizeof( double));
+         free( sr);
+         find_median_orbit( sr_orbits, n_sr_orbits);
+         memcpy( orbit, sr_orbits, 6 * sizeof( double));
+         compute_sr_sigmas( sr_orbits, n_sr_orbits, orbit_epoch, 0, epoch_shown);
+         n_obs += n_radar_obs;
+         shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, NULL);
+         available_sigmas_hash = compute_available_sigmas_hash( obs, n_obs,
+                     epoch_shown, perturbers, 0);
+         set_locs( orbit, orbit_epoch, obs, n_obs);
+         integration_timeout = 0;
+         return( orbit_epoch);
+         }
+      free( sr);
       }
+
    while( best_score > acceptable_score_limit)
       {
       int end, n_subarc_obs, n_geocentric_obs = 0;
@@ -4023,10 +4352,8 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
       fail_on_hitting_planet = true;
       if( n_subarc_obs >= 3)     /* at least three observations;  try Gauss */
          {
-#ifdef CONSOLE
          if( show_runtime_messages)
             move_add_nstr( 14, 10, "In Gauss solution", -1);
-#endif
          for( i = 0; i < 3; i++)
             {
             double epoch =
@@ -4040,7 +4367,7 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
 
                if( !set_locs( orbit, epoch, obs + start, n_subarc_obs))
                   {
-                  score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit);
+                  score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit, epoch);
                   if( debug_level > 2)
                      debug_printf( "Locations set; score %f (%d)\n", score, i);
                   if( score < 1000. &&
@@ -4067,10 +4394,8 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
                i = 3;
             }
          }           /* end of trying Gauss */
-#ifdef CONSOLE
       if( show_runtime_messages)
          move_add_nstr( 14, 10, "Gauss done", -1);
-#endif
       if( arclen < max_arg_length_for_vaisala)
          for( i = 0; i < 2; i++)
             {
@@ -4109,8 +4434,10 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
                   score = 9e+5;                 /* but we should keep trying */
                else
                   {
-                  adjust_herget_results( obs + start, n_subarc_obs, orbit);
-                  score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit);
+                  if( adjust_herget_results( obs + start, n_subarc_obs, orbit))
+                     score = 1.e+7;
+                  else
+                     score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit, obs[start].jd);
                   }
                if( debug_level > 2)
                   debug_printf( "%d, pseudo-r %f: score %f, herget rval %d\n",
@@ -4122,13 +4449,11 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
                   best_score = score;
                   memcpy( best_orbit, orbit, 6 * sizeof( double));
                   }
-#ifdef CONSOLE
                if( show_runtime_messages)
                   {
-                  sprintf( msg_buff, "Method %d, r=%.4f", i, pseudo_r);
+                  snprintf_err( msg_buff, sizeof( msg_buff), "Method %d, r=%.4f", i, pseudo_r);
                   move_add_nstr( 14, 10, msg_buff, -1);
                   }
-#endif
                if( score > 5e+4)   /* usually means eccentricity > 100! */
                   {
                   orbit_looks_reasonable = 0;      /* should stop looking */
@@ -4144,7 +4469,7 @@ double initial_orbit( OBSERVE FAR *obs, int n_obs, double *orbit)
 
          memcpy( orbit, best_orbit, 6 * sizeof( double));
          attempt_improvements( orbit, obs + start, n_subarc_obs);
-         score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit);
+         score = evaluate_initial_orbit( obs + start, n_subarc_obs, orbit, obs[start].jd);
          if( debug_level > 2)
             debug_printf( "After attempted improvements: score %f\n", score);
          if( score < best_score)       /* call it a success: */
@@ -4182,6 +4507,7 @@ int orbital_monte_carlo( const double *orbit, OBSERVE *obs, const int n_obs,
          const double curr_epoch, const double epoch_shown)
 {
    unsigned i;
+   int planet_orbiting = 0;
    extern int append_elements_to_element_file;
    extern const char *elements_filename;
    const char *saved_name = elements_filename;
@@ -4197,24 +4523,23 @@ int orbital_monte_carlo( const double *orbit, OBSERVE *obs, const int n_obs,
    for( i = 0; i < n_sr_orbits; i++)
       {
       double *torbit = sr_orbits + i * n_orbit_params;
-      const double sig_squared = generate_mc_variant_from_covariance( torbit, orbit);
-      const char *format_str = "%+17.6f %+17.6f %+17.6f %+14.12f %+14.12f %+14.12f\n";
 
-      if( i < 1000)
+      generate_mc_variant_from_covariance( torbit, orbit);
+      integrate_orbit( torbit, curr_epoch, epoch_shown);
+      if( !i)
          {
-         double rms;
-         int n_resids;
+         double unused_relative_vect[MAX_N_PARAMS];
 
-         set_locs( torbit, curr_epoch, obs, n_obs);
-         rms = compute_weighted_rms( obs, n_obs, &n_resids);
-         debug_printf( "Var %4d: %9.6f %.8f\n", i, sig_squared,
-                        rms * rms * n_resids);
+         planet_orbiting = find_central_object( obs, epoch_shown, torbit,
+                                         unused_relative_vect);
          }
-      integrate_orbit( torbit, curr_epoch, epoch_shown);
       write_out_elements_to_file( torbit, epoch_shown, epoch_shown,
            obs, n_obs, "", 6, 1, ELEM_OUT_ALTERNATIVE_FORMAT | ELEM_OUT_NO_COMMENT_DATA);
       append_elements_to_element_file = 1;
       if( ofile)
+         {
+         const char *format_str = "%+17.6f %+17.6f %+17.6f %+14.12f %+14.12f %+14.12f\n";
+
          fprintf( ofile, format_str,
                torbit[0] * AU_IN_KM,
                torbit[1] * AU_IN_KM,
@@ -4222,11 +4547,12 @@ int orbital_monte_carlo( const double *orbit, OBSERVE *obs, const int n_obs,
                torbit[3] * AU_IN_KM / seconds_per_day,
                torbit[4] * AU_IN_KM / seconds_per_day,
                torbit[5] * AU_IN_KM / seconds_per_day);
+         }
       }
    if( ofile)
       fclose( ofile);
    set_locs( orbit, curr_epoch, obs, n_obs);
-   compute_sr_sigmas( sr_orbits, n_sr_orbits, curr_epoch, epoch_shown);
+   compute_sr_sigmas( sr_orbits, n_sr_orbits, curr_epoch, planet_orbiting, epoch_shown);
    available_sigmas_hash = compute_available_sigmas_hash( obs, n_obs,
          epoch_shown, perturbers, 0);
    append_elements_to_element_file = 0;
@@ -4438,11 +4764,11 @@ static int auto_reject_obs( OBSERVE *obs, int n_obs,
    return( rval);
 }
 
-/* We try rejecting outliers that are more than three sigmas from
-nominal.  99.9% of the time,  that works Just Fine,  possibly rejecting
-one or more outliers.  It may fail if most of the observations are
-outside three sigmas.  We keep trying with progressively larger
-limits.
+/* We try rejecting outliers that are more than (by default) three
+sigmas from nominal.  99.9% of the time,  that works Just Fine,
+possibly rejecting one or more outliers.  It may fail if most of
+the observations are outside three sigmas.  We keep trying with
+progressively larger limits.
 
    This can help when a few observations are so horrendously off
 that they drag all other observations in the other direction to compensate.
@@ -4453,7 +4779,8 @@ may look reasonable... but will then be subjected to a second,  or
 static int auto_reject_obs_within_arc( OBSERVE *obs, int n_obs)
 {
    int rval;
-   double reject_limit = 3.;   /* reject anything outside three sigmas */
+   extern double automatic_outlier_rejection_limit;
+   double reject_limit = automatic_outlier_rejection_limit;
 
    do
       {
@@ -4463,18 +4790,21 @@ static int auto_reject_obs_within_arc( OBSERVE *obs, int n_obs)
    return( rval);
 }
 
-void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
+void attempt_extensions( OBSERVE *obs, int n_obs, double *orbit,
                                     const double epoch)
 {
    double best_orbit[6];
    int best_start, best_end, i;
    bool done = false;
+   bool reverted_to_best_orbit = false;
    const double residual_limit = 200.;   /* allow up to 200" in orbit extension */
    double arc_limit_in_days = atof( get_environment_ptr( "AUTO_ARC_LEN"));
    const int stored_setting_outside_of_arc = setting_outside_of_arc;
    int best_available_sigmas;
    unsigned best_perturbers = perturbers;
+   const int n_radar_obs = sort_unused_obs_to_end( obs, n_obs);
 
+   n_obs -= n_radar_obs;
    if( !arc_limit_in_days)
       arc_limit_in_days = 3650;        /* Default to ten years at most */
    setting_outside_of_arc = 0;
@@ -4520,17 +4850,23 @@ void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
                          compute_rms( obs, n_obs));
             if( available_sigmas == COVARIANCE_AVAILABLE)
                {
-               double lov_sigmas;
+               double lov_sigmas, rms = compute_weighted_rms( obs, n_obs, NULL);
+               double prev_rms = 1e+70;
+               int j;
 
-               if( debug_level > 2)
-                  debug_printf( "  Got a covariance,  setting %d obs\n", n_obs);
-               set_locs( orbit, epoch, obs, n_obs);
-               if( debug_level > 2)
-                  debug_printf( "  Seeking minimum along LOV\n");
-               lov_sigmas = improve_along_lov( orbit, epoch, eigenvects[0],
-                                            n_orbit_params, n_obs, obs);
-               if( debug_level > 2)
-                  debug_printf( "  Minimum at %f sigmas\n", lov_sigmas);
+               for( j = 0; j < 5 && rms > 2. &&
+                                     (rms > 2000. || prev_rms > rms + 0.1); j++)
+                  {
+                  prev_rms = rms;
+                  set_locs( orbit, epoch, obs, n_obs);
+                  lov_sigmas = improve_along_lov( orbit, epoch, eigenvects[0],
+                                               n_orbit_params, n_obs, obs);
+
+                  rms = compute_weighted_rms( obs, n_obs, NULL);
+                  if( debug_level > 2)
+                     debug_printf( "  iter %d; %d obs; minimum at %f sigmas; weighted RMS %f\n",
+                                          j, n_obs, lov_sigmas, rms);
+                  }
                }
             if( full_improvement( obs, n_obs, orbit, epoch, NULL,
                            NO_ORBIT_SIGMAS_REQUESTED, epoch))
@@ -4540,7 +4876,7 @@ void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
                if( debug_level > 2)
                   debug_printf( "fully improved : rms %f\n",
                                compute_rms( obs, n_obs));
-               score[i] = evaluate_initial_orbit( obs, n_obs, orbit);
+               score[i] = evaluate_initial_orbit( obs, n_obs, orbit, epoch);
                if( i && score[i - 1] < score[i] + .1)      /* no real improvement... */
                   result = 1;                               /* we must have converged */
                if( score[i] > 10000.)      /* clearly blowing up */
@@ -4574,10 +4910,7 @@ void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
       memcpy( orbit, best_orbit, 6 * sizeof( double));
       available_sigmas = best_available_sigmas;
       perturbers = best_perturbers;
-#if 0
-      full_improvement( obs, n_obs, orbit, epoch, NULL,
-                           NO_ORBIT_SIGMAS_REQUESTED, epoch);
-#endif
+      reverted_to_best_orbit = true;
       }
    for( i = 0; i < best_start; i++)
       obs[i].is_included = 0;
@@ -4603,9 +4936,92 @@ void attempt_extensions( OBSERVE *obs, const int n_obs, double *orbit,
          integrate_orbit( orbit, obs[j].jd, epoch);
          }
       }
+   if( reverted_to_best_orbit && available_sigmas == COVARIANCE_AVAILABLE)
+      {
+      /* Find_Orb may write covar.json during an attempted arc extension,  then
+      revert to `best_orbit` without re-running `full_improvement()` (and thus
+      without rewriting covar.json).  Ensure the covariance output is synced to
+      the final orbit and final included-observation set. */
+      full_improvement( obs, n_obs, orbit, epoch, NULL,
+                           NO_ORBIT_SIGMAS_REQUESTED, epoch);
+      }
+   if( n_radar_obs)
+      {
+      n_obs += n_radar_obs;
+      shellsort_r( obs, n_obs, sizeof( OBSERVE), compare_observations, NULL);
+      }
    set_locs( orbit, epoch, obs, n_obs);
 }
 
+#define is_power_of_two( X)   (!((X) & ((X) - 1)))
+
+/* If the input data is ADES and has the trkID set,  then select_tracklet()
+simply selects observations with a matching trkID.
+
+   If we can't do that,  then defining a 'tracklet' is difficult,  since
+observatories vary in cadence.  Here,  we attempt to estimate the cadence by
+starting from the 'idx' observation and finding the nearest (previous or
+next) observation in time from that observatory.  We then say that as long
+as observations are within twice that amount,  they'll be considered to be
+part of the tracklet (or if they're within 30 minutes of each other).  This
+is all quite ad hoc,  but appears to produce 'reasonable' results.  */
+
+int select_tracklet( OBSERVE *obs, const int n_obs, const int idx)
+{
+   int i, rval = 0;
+   double tracklet_span = 0.;
+   const double min_tracklet_span = 30. / minutes_per_day;
+   double jd = obs[idx].jd;
+   char *tptr = (obs[idx].ades_ids ? strstr( obs[idx].ades_ids, "trkID") : NULL);
+
+   for( i = 0; i < n_obs; i++)
+      obs[i].flags &= ~OBS_IS_SELECTED;
+   if( tptr)
+      {
+      char trk_id[40];
+
+      sscanf( tptr, "%39s", trk_id);
+      for( i = 0; i < n_obs; i++)
+         if( obs[i].ades_ids && strstr( obs[i].ades_ids, trk_id))
+            {
+            obs[i].flags |= OBS_IS_SELECTED;
+            rval++;
+            }
+      return rval;
+      }
+   for( i = idx - 1; i >= 0 && jd - obs[i].jd < 1; i--)
+      if( !strcmp( obs[i].mpc_code, obs[idx].mpc_code))
+         {
+         tracklet_span = jd - obs[i].jd;
+         break;
+         }
+   for( i = idx + 1; i < n_obs && obs[i].jd - jd < tracklet_span; i++)
+      if( !strcmp( obs[i].mpc_code, obs[idx].mpc_code))
+         {
+         tracklet_span = obs[i].jd - jd;
+         break;
+         }
+   tracklet_span *= 2.;
+   if( tracklet_span < min_tracklet_span)
+      tracklet_span = min_tracklet_span;
+   for( i = idx - 1; i >= 0 && jd - obs[i].jd < tracklet_span; i--)
+      if( !strcmp( obs[i].mpc_code, obs[idx].mpc_code))
+         {
+         jd = obs[i].jd;
+         obs[i].flags |= OBS_IS_SELECTED;
+         rval++;
+         }
+   jd = obs[idx].jd;
+   for( i = idx; i < n_obs && obs[i].jd - jd < tracklet_span; i++)
+      if( !strcmp( obs[i].mpc_code, obs[idx].mpc_code))
+         {
+         jd = obs[i].jd;
+         obs[i].flags |= OBS_IS_SELECTED;
+         rval++;
+         }
+   return( rval);
+}
+
 int metropolis_search( OBSERVE *obs, const int n_obs, double *orbit,
                const double epoch, int n_iterations, double scale)
 {
@@ -4659,10 +5075,13 @@ char *find_numbered_mp_info( const int number);    /* mpc_obs.cpp */
 int check_for_other_processes( const int locking);    /* elem_out.cpp */
 int get_temp_dir( char *name, const size_t max_len);   /* miscell.cpp */
 #endif
+int detect_perturbers( const double jd, const double * __restrict xyz,
+                       double *accel);
 
 int clean_up_find_orb_memory( void)
 {
    extern char *temp_obs_filename;     /* miscell.cpp */
+   extern char *mpec_error_message;
 
    free_sigma_recs( );
    get_observer_data( NULL, NULL, NULL);
@@ -4681,24 +5100,30 @@ int clean_up_find_orb_memory( void)
    load_cospar_file( NULL);
    update_environ_dot_dat( );
    load_earth_orientation_params( NULL, NULL);
-   get_environment_ptr( NULL);
    pop_all_orbits( );
    galactic_confusion( -99., 0.);
    find_numbered_mp_info( 0);
+   detect_perturbers( 0, NULL, NULL);
+   default_config_dir_name( NULL, NULL);
 #if !defined( _WIN32) && !defined( __WATCOMC__)
-   if( check_for_other_processes( 0))
-      {
-      char cmd[100];
+   char cmd[100];
 
-      strcpy( cmd, "rm -r ");
-      get_temp_dir( cmd + 6, sizeof( cmd) - 6);
-      if( !memcmp( cmd + 6, "/tmp/", 5))
-         debug_printf( "Result %d\n", system( cmd));
-      }
+   strcpy( cmd, "rm -r ");
+   if( get_temp_dir( cmd + 6, sizeof( cmd) - 6))
+      if( !memcmp( cmd, "rm -r /tmp/find_orb", 19))
+         {
+         const int ret_val = system( cmd);
+
+         if( ret_val)
+            debug_printf( "Result %d\n", ret_val);
+         }
    unlink( temp_obs_filename);
 #else
    _unlink( temp_obs_filename);
 #endif
+   get_environment_ptr( NULL);
    free( temp_obs_filename);
+   free( mpec_error_message);
+   mpec_error_message = NULL;
    return( 0);
 }
diff --git a/pl_cache.cpp b/pl_cache.cpp
index 9eae85ce..830e6f44 100644
--- a/pl_cache.cpp
+++ b/pl_cache.cpp
@@ -62,7 +62,7 @@ int generic_message_box( const char *message, const char *box_type);
 int compute_rough_planet_loc( const double t_cen, const int planet_idx,
                                           double *vect);    /* sm_vsop.cpp */
 int asteroid_position_raw( const int astnum, const double jd,
-                              double *posn);       /* bc405.cpp */
+                              double *posn, double *vel);      /* bc405.cpp */
 int64_t nanoseconds_since_1970( void);                      /* mpc_obs.c */
 int format_jpl_ephemeris_info( char *buff);                 /* pl_cache.c */
 
@@ -93,7 +93,9 @@ static int planet_posn_raw( int planet_no, const double jd,
       {
       double temp_loc[4];
 
-      rval = asteroid_position_raw( planet_no - bc405_start, jd, temp_loc);
+      rval = asteroid_position_raw( planet_no - bc405_start, jd,
+               (calc_vel ? NULL : temp_loc),
+               (calc_vel ? temp_loc : NULL));
       if( debug_level > 8)
          debug_printf( "JD %f, minor planet %d: (%f %f %f)\n",
                      jd, planet_no, temp_loc[0], temp_loc[1], temp_loc[2]);
@@ -472,9 +474,9 @@ int planet_posn( const int planet_no, const double jd, double *vect_2000)
          rval = planet_posn( 10 + vel_offset, jd, moon_loc);    /* lunar offset vect  */
       if( !rval)
          {
-         unsigned i;
+         size_t i;
          const double EARTH_MOON_BARYCENTER_FACTOR = 82.300679;
-         const double factor = (planet_no == PLANET_POSN_EARTH ?
+         const double factor = (planet_no % PLANET_POSN_VELOCITY_OFFSET == PLANET_POSN_EARTH ?
                      -1. / EARTH_MOON_BARYCENTER_FACTOR :
                  1. - 1. / EARTH_MOON_BARYCENTER_FACTOR);
 
@@ -619,15 +621,15 @@ int format_jpl_ephemeris_info( char *buff)
 {
    int de_version;
    double jd_start, jd_end;
+   const size_t buff_size = 250;
 
    get_jpl_ephemeris_info( &de_version, &jd_start, &jd_end);
    if( !de_version && !jd_start && !jd_end)
-      strcpy( buff, get_find_orb_text( 2056));
+      strlcpy_err( buff, get_find_orb_text( 2056), buff_size);
    else
-      sprintf( buff,
+      snprintf_err( buff, buff_size,
             "\nUsing %s; covers years %.1f to %.1f\n",
             jpl_get_ephem_name( jpl_eph),
-            (jd_start - J2000) / 365.25 + 2000.,
-            (jd_end   - J2000) / 365.25 + 2000.);
+            JD_TO_YEAR( jd_start), JD_TO_YEAR( jd_end));
    return( de_version);
 }
diff --git a/progcode.c b/progcode.c
index dd02fec4..751a491b 100644
--- a/progcode.c
+++ b/progcode.c
@@ -2,34 +2,90 @@
 
 https://minorplanetcenter.net/iau/lists/ProgramCodes.txt
 
+   (should switch over to the JSON form at
+
+https://minorplanetcenter.net/static/downloadable-files/program_codes.json
+
 and produce a file 'progcode.txt' suitable for Find_Orb to extract
 observer info from.  Note that some editing of the input (or output)
 is required; some observers appear twice,  with modifications due to
-diacritical marks.  When doing updates,  I compare to the previous
-version to make sure such problems don't creep back in.
+diacritical marks.  That's because MPC uses the file at the above URL
+to determine the program code associated with a given name,  and
+people may submit as (say) "G. Borisov",  then as "G. V. Borisov".
+I'm using the file to find the (canonical) name for a given program
+code,  and therefore drop the duplicates.
+
+When doing updates,  I compare to the previous version to make sure
+such problems don't creep back in.
 
    Compile with :
 
 gcc -Wall -pedantic -Wextra -O3 progcode.c -o progcode
 
-   Extension of the table provided at the above URL.  Some inference
-is involved here,  and I'm not totally certain of the extended part.
-
-10 !       20 +      30 `     40 ?      50 I      60 S
-11 "       21 ,      31 {     41 @      51 J      61 T
-12 #       22 -      32 |     42 A      52 K      62 U
-13 $       23 .      33 }     43 B      53 L      63 V
-14 %       24 /      34 ~     44 C      54 M
-15 &       25 [      35 :     45 D      55 N
-16 '       26 \      36 ;     46 E      56 O
-17 (       27 ]      37 <     47 F      57 P
-18 )       28 ^      38 =     48 G      58 Q
-19 *       29 _      39 >     49 H      59 R
+   Extension of the table provided at the above URL.  The top line
+goes one character further to include the pound (currency) symbol,
+but I'd expect a non-7-bit-ASCII character to raise hell.
+
+10 !    20 +    30 `    40 ?    50 I    60 S    70 c    80 m    90 w
+11 "    21 ,    31 {    41 @    51 J    61 T    71 d    81 n    91 x
+12 #    22 -    32 |    42 A    52 K    62 U    72 e    82 o    92 y
+13 $    23 .    33 }    43 B    53 L    63 V    73 f    83 p    93 z
+14 %    24 /    34 ~    44 C    54 M    64 W    74 g    84 q
+15 &    25 [    35 :    45 D    55 N    65 X    75 h    85 r
+16 '    26 \    36 ;    46 E    56 O    66 Y    76 i    86 s
+17 (    27 ]    37 <    47 F    57 P    67 Z    77 j    87 t
+18 )    28 ^    38 =    48 G    58 Q    68 a    78 k    88 u
+19 *    29 _    39 >    49 H    59 R    69 b    79 l    89 v
 */
 
 #include <stdio.h>
 #include <string.h>
 
+/* Returns 0 if the line was good,  or -1 if it should be expunged.
+The original 'ProgramCodes.txt' has several blunders in it. */
+
+static int correct_line( char *buff)
+{
+   size_t i = strlen( buff);
+   const char *removers[] = {
+               "095 2 V. Rumyantsev",
+               "095 4 G. Borisov",
+               "266 3 J. Kavelaars",
+               "267 3 J. Kavelaars",
+               "568 1 D. Jewitt",
+               "658 4 JJ Kavelaars",
+               "703 1 E. J. Christensen",
+               "G40 9 B. Luetkenhoener",
+               "G96 1 E. J. Christensen",
+               "Q62 } S. K\\\"urti",
+               "U69 # B. Luetkenhoener",
+               "W84 \" J. Pena Z.",
+               NULL };
+   const char *replacers[] = {
+            "JJ Kavelaars\n",     "J. J. Kavelaars\n",
+#ifdef LATEXIZE_NAMES
+            "F. Ocana\n",         "F. Oca\\~na\n",
+            "B. Lutkenhoner\n",   "B. L\\\"utkenh\\\"oner\n",
+            "S. Kurti\n",         "S. K\\\"urti",
+            "M. Juric\n",         "M. Juri\\'c",
+#endif
+            "D, C. Jewitt\n",     "D. C. Jewitt\n",
+            };
+
+   while( i && buff[i - 1] <= ' ')
+      i--;
+   buff[i] = '\n';      /* remove trailing spaces */
+   buff[i + 1] = '\0';
+                  /* ad hoc fixes to blunders in original text : */
+   for( i = 0; removers[i]; i++)
+      if( strstr( buff, removers[i]))
+         return( -1);
+   for( i = 0; replacers[i]; i += 2)
+      if( !strcmp( buff + 6, replacers[i]))
+         strcpy( buff + 6, replacers[i + 1]);
+   return( 0);
+}
+
 int main( const int argc, const char **argv)
 {
    const char *filename = (argc == 1 ? "ProgramCodes.txt" : argv[1]);
@@ -46,7 +102,8 @@ int main( const int argc, const char **argv)
    while( fgets( buff, sizeof( buff), ifile))
       if( buff[0] > ' ' && buff[1] > ' ' && buff[2] > ' '
                         && buff[3] == ' ' && buff[4] > ' '
-                        && buff[5] == ' ' && buff[6] > ' ')
+                        && buff[5] == ' ' && buff[6] > ' '
+                        && !correct_line( buff))
          {
          if( memcmp( prev_code, buff, 5))
             {
diff --git a/progcode.txt b/progcode.txt
index 3dac3251..262f5e27 100644
--- a/progcode.txt
+++ b/progcode.txt
@@ -1,16 +1,9 @@
-Downloaded 2022 Sep 26 from
+Downloaded 2024 Apr 24 from
 
 https://minorplanetcenter.net/iau/lists/ProgramCodes.txt
 
 and converted to the 'standard' details form, using 'progcode.c' (q.v.)
 
-Patches made manually :
-- duplicate B. Luetkenhoener/Lutkenhoner for (G40) and (U69) removed
-- duplicate S. K\"urti for (Q62) removed
-    (Find_Orb will add umlauts as necessary for these,  from observer.txt)
-- duplicate D, C. Jewitt (note comma) removed
-- changed JJ Kavelaars to J. J. Kavelaars
-
 COD 010 1
 OBS E. W. Elst
 
@@ -77,6 +70,9 @@ OBS F. Borngen
 COD 033 5
 OBS C. Demeautis
 
+COD 033 6
+OBS S. Deen
+
 COD 071 1
 OBS V. Ivanova
 
@@ -162,14 +158,12 @@ COD 095 1
 OBS Y. N. Krugly
 
 COD 095 2
-OBS V. Rumyantsev
 OBS V. V. Rumyantsev
 
 COD 095 3
 OBS S. Nazarov
 
 COD 095 4
-OBS G. Borisov
 OBS G. V. Borisov
 
 COD 095 5
@@ -256,6 +250,9 @@ OBS W. Boonplod
 COD 249 3
 OBS K. Battams
 
+COD 249 4
+OBS S. Deen
+
 COD 260 0
 OBS F. Manca
 
@@ -587,11 +584,13 @@ OBS A. H. Parker
 
 COD 266 3
 OBS J. J. Kavelaars
-OBS J. Kavelaars
 
 COD 266 4
 OBS S. B. Porter
 
+COD 266 5
+OBS F. Yoshida
+
 COD 267 1
 OBS M. W. Buie
 
@@ -600,7 +599,6 @@ OBS A. H. Parker
 
 COD 267 3
 OBS J. J. Kavelaars
-OBS J. Kavelaars
 
 COD 268 1
 OBS M. W. Buie
@@ -609,7 +607,7 @@ COD 268 2
 OBS A. H. Parker
 
 COD 268 3
-OBS JJ Kavelaars
+OBS J. J. Kavelaars
 
 COD 268 4
 OBS A. Taylor
@@ -632,6 +630,9 @@ OBS D. Souami
 COD 274 0
 OBS M. Micheli
 
+COD 274 1
+OBS H. B. Akins
+
 COD 290 1
 OBS M. Holman
 
@@ -731,6 +732,9 @@ OBS T. Saifollahi
 COD 309 ]
 OBS D. Souami
 
+COD 309 ^
+OBS S. S. Sheppard
+
 COD 413 0
 OBS K. S. Russell
 
@@ -1017,6 +1021,12 @@ OBS Y. Ramanjooloo
 COD 568 b
 OBS M. J. Brucker
 
+COD 568 c
+OBS C. O. Chandler
+
+COD 568 d
+OBS S. Kurti
+
 COD 658 1
 OBS D. D. Balam
 
@@ -1498,6 +1508,18 @@ OBS B. Gladman
 COD 696 $
 OBS M. J. Brucker
 
+COD 703 0
+OBS A. Zooniverse
+
+COD 703 1
+OBS P. I. Catalina
+
+COD 703 2
+OBS M. Micheli
+
+COD 703 3
+OBS D. Rankin
+
 COD 705 1
 OBS M. Hammergren
 
@@ -1718,6 +1740,9 @@ OBS G. Bernstein
 COD 807 O
 OBS K. Ly
 
+COD 807 P
+OBS M. Popescu
+
 COD 809 0
 OBS R. Scarpa
 
@@ -2119,6 +2144,9 @@ OBS W. Boonplod
 COD C49 3
 OBS K. Battams
 
+COD C49 4
+OBS S. Deen
+
 COD C50 1
 OBS W. Gray
 
@@ -2143,6 +2171,9 @@ OBS T. Santana-Ros
 COD D20 3
 OBS M. Todd
 
+COD D20 4
+OBS F. Ocana
+
 COD D90 1
 OBS U. Wolff
 
@@ -2401,6 +2432,15 @@ OBS W. Cuppens
 COD E10 ,
 OBS M. Trueblood
 
+COD E10 -
+OBS P. Breitenstein
+
+COD E10 .
+OBS F. Ocana
+
+COD E10 /
+OBS J. M. Perez-Redondo
+
 COD E26 1
 OBS U. Wolff
 
@@ -2561,6 +2601,15 @@ OBS M. Trueblood
 COD F65 /
 OBS P. Breitenstein
 
+COD F65 [
+OBS L. Sanjuan
+
+COD F65 \
+OBS J. M. Perez
+
+COD F65 ]
+OBS J. M. Perez-Redondo
+
 COD G37 1
 OBS L. H. Wasserman
 
@@ -2612,6 +2661,9 @@ OBS M.-T. Hui
 COD G37 (
 OBS W. Romanishin
 
+COD G37 )
+OBS T. Kareta
+
 COD G40 1
 OBS N. E. Pritchett
 
@@ -2729,6 +2781,27 @@ OBS R. E. Pike
 COD G83 4
 OBS A. Giunta
 
+COD G83 5
+OBS P. I. Catalina
+
+COD G96 0
+OBS A. Zooniverse
+
+COD G96 1
+OBS P. I. Catalina
+
+COD G96 2
+OBS M. Micheli
+
+COD G96 3
+OBS D. Rankin
+
+COD G96 4
+OBS J. B. Fazekas
+
+COD G96 5
+OBS K. Sarneczky
+
 COD H06 0
 OBS J. Skvarc
 
@@ -3057,12 +3130,24 @@ OBS S. Margheim
 COD I11 5
 OBS M. Micheli
 
+COD I11 6
+OBS E. J. Christensen
+
+COD I11 7
+OBS M. J. Brucker
+
+COD I11 8
+OBS D. Rankin
+
 COD I18 1
 OBS C. Fallscheer
 
 COD I18 2
 OBS A. W. Rengstorf
 
+COD I18 3
+OBS W. D. Bruton
+
 COD I22 1
 OBS D. Lane
 
@@ -3189,6 +3274,18 @@ OBS L. Buzzi
 COD I89 ?
 OBS J.-C. Merlin
 
+COD I89 @
+OBS G. Gasparovic
+
+COD I89 A
+OBS M. G. J. Breukers
+
+COD I89 B
+OBS M. R. Thompson
+
+COD I89 C
+OBS T. Thaluang
+
 COD J04 1
 OBS D. Koschny
 
@@ -3222,6 +3319,12 @@ OBS R. Kresken
 COD J04 "
 OBS R. Cornea
 
+COD J04 #
+OBS S. Deen
+
+COD J04 $
+OBS F. Ocana
+
 COD J13 1
 OBS D. Bowdley
 
@@ -3279,6 +3382,69 @@ OBS S. Deen
 COD J75 6
 OBS M. Micheli
 
+COD J75 7
+OBS K. Ly
+
+COD K91 0
+OBS M. Micheli
+
+COD K91 1
+OBS R. Mendez
+
+COD K91 2
+OBS J. D. Armstrong
+
+COD K91 3
+OBS F. Ocana
+
+COD K91 4
+OBS P. Breitenstein
+
+COD K91 5
+OBS A. Hale
+
+COD K91 6
+OBS E. Schwab
+
+COD K92 0
+OBS M. Micheli
+
+COD K92 1
+OBS R. Mendez
+
+COD K92 2
+OBS T. Lister
+
+COD K92 3
+OBS J. D. Armstrong
+
+COD K92 4
+OBS A. Hale
+
+COD K92 5
+OBS E. Schwab
+
+COD K93 0
+OBS M. Micheli
+
+COD K93 1
+OBS R. Mendez
+
+COD K93 2
+OBS J. D. Armstrong
+
+COD K93 3
+OBS A. Hale
+
+COD K93 4
+OBS W. Thuillot
+
+COD K93 5
+OBS F. Ocana
+
+COD K93 6
+OBS E. Schwab
+
 COD K99 1
 OBS V. I. Kudak
 
@@ -3342,6 +3508,24 @@ OBS A. Pearce
 COD L81 %
 OBS M. Jaeger
 
+COD L81 &
+OBS P. VanWylen
+
+COD L81 '
+OBS J. Jahn
+
+COD L81 (
+OBS J. Camarasa
+
+COD M49 0
+OBS D. Husar
+
+COD M49 1
+OBS M. Junius
+
+COD M49 2
+OBS G. Duszanowicz
+
 COD N50 1
 OBS M. Micheli
 
@@ -3602,9 +3786,138 @@ OBS G. Duszanowicz
 COD Q62 o
 OBS T. Sadowski
 
+COD Q62 p
+OBS T. Garrel
+
+COD Q62 q
+OBS C. Bass
+
+COD Q62 r
+OBS M. G. J. Breukers
+
+COD Q62 s
+OBS D. Rankin
+
+COD Q62 t
+OBS B. Koch
+
+COD Q63 0
+OBS M. Micheli
+
+COD Q63 1
+OBS R. Mendez
+
+COD Q63 2
+OBS J. D. Armstrong
+
+COD Q63 3
+OBS J. M. Perez
+
+COD Q63 4
+OBS A. Hale
+
+COD Q64 0
+OBS M. Micheli
+
+COD Q64 1
+OBS R. Mendez
+
+COD Q64 2
+OBS W. Thuillot
+
+COD Q64 3
+OBS P. Breitenstein
+
+COD Q64 4
+OBS J. M. Perez
+
+COD Q64 5
+OBS A. Hale
+
+COD Q64 6
+OBS J. D. Armstrong
+
+COD T09 0
+OBS D. J. Tholen
+
+COD T09 1
+OBS S. Deen
+
+COD T09 2
+OBS K. Ly
+
+COD T09 3
+OBS J. Kleyna
+
+COD T09 4
+OBS S. Urakawa
+
+COD T11 0
+OBS S. Deen
+
+COD T12 0
+OBS D. J. Tholen
+
+COD T12 1
+OBS R. Weryk
+
+COD T12 2
+OBS Y. Ramanjooloo
+
+COD T12 3
+OBS D. Hung
+
+COD T12 4
+OBS S. S. Sheppard
+
+COD T14 0
+OBS D. J. Tholen
+
+COD T14 1
+OBS L. Wells
+
+COD T14 2
+OBS C. Wipper
+
+COD T14 3
+OBS R. Weryk
+
+COD T14 4
+OBS E. J. Ashton
+
+COD T14 5
+OBS S. Deen
+
+COD T14 6
+OBS K. Ly
+
+COD T14 7
+OBS M. Micheli
+
+COD T14 8
+OBS C. Crowder
+
+COD T14 9
+OBS S. Kurti
+
 COD T15 0
 OBS E. J. Christensen
 
+COD T15 1
+OBS K. Ly
+
+COD T15 2
+OBS S. Deen
+
+COD T15 3
+OBS M. J. Brucker
+
+COD T15 4
+OBS M. Micheli
+
+COD T15 5
+OBS P. I. Catalina
+
 COD U65 1
 OBS C. Fallscheer
 
@@ -3743,6 +4056,60 @@ OBS D. De Martin
 COD U69 B
 OBS P. M. Holzner
 
+COD U69 C
+OBS I. Robbins
+
+COD U69 D
+OBS T. Garrel
+
+COD U69 E
+OBS R. Townsend
+
+COD U94 0
+OBS H. Sato
+
+COD U94 1
+OBS T. Prystavski
+
+COD U94 2
+OBS D. De Martin
+
+COD U94 3
+OBS J.-C. Merlin
+
+COD U94 4
+OBS M. Suzuki
+
+COD U94 5
+OBS F. D. Romanov
+
+COD U94 6
+OBS K. Yoshimoto
+
+COD U94 7
+OBS N. Falla
+
+COD U94 8
+OBS M. Mattiazzo
+
+COD U94 9
+OBS G. Gasparovic
+
+COD U94 !
+OBS A. Pearce
+
+COD U94 "
+OBS M. Urbanik
+
+COD U94 #
+OBS N. Paul
+
+COD U94 $
+OBS G. Baj
+
+COD U94 %
+OBS J. Jahn
+
 COD V07 1
 OBS M. Rudenko
 
@@ -3752,6 +4119,48 @@ OBS A. Mokhnatkin
 COD V26 2
 OBS M. Micheli
 
+COD V37 0
+OBS M. Micheli
+
+COD V37 1
+OBS R. Mendez
+
+COD V37 2
+OBS W. Cuppens
+
+COD V37 3
+OBS B. Cardeynaels
+
+COD V37 4
+OBS J. D. Armstrong
+
+COD V37 5
+OBS T. Lister
+
+COD V37 6
+OBS F. Ocana
+
+COD V37 7
+OBS P. Breitenstein
+
+COD V39 0
+OBS M. Micheli
+
+COD V39 1
+OBS R. Mendez
+
+COD V39 2
+OBS J. D. Armstrong
+
+COD V39 3
+OBS T. Lister
+
+COD V39 4
+OBS W. Thuillot
+
+COD V39 5
+OBS F. Ocana
+
 COD W11 1
 OBS C. Fallscheer
 
@@ -3770,6 +4179,18 @@ OBS A. W. Rengstorf
 COD W38 3
 OBS D. L. Domingue
 
+COD W57 0
+OBS M. Micheli
+
+COD W57 1
+OBS F. Ocana
+
+COD W57 2
+OBS R. Kresken
+
+COD W57 3
+OBS H. ESA Pipeline
+
 COD W76 1
 OBS E. Bryssinck
 
@@ -3854,7 +4275,6 @@ OBS F. Valdes
 
 COD W84 "
 OBS J. Pena
-OBS J. Pena Z.
 
 COD W84 #
 OBS R. S. McMillan
@@ -3925,6 +4345,84 @@ OBS M. Brucker
 COD W84 ~
 OBS T. Linder
 
+COD W84 :
+OBS S. Kurti
+
+COD W84 ;
+OBS P. VanWylen
+
+COD W84 <
+OBS A. Coffinet
+
+COD W84 =
+OBS L. Hudin
+
+COD W84 >
+OBS E. O. Mendes
+
+COD W85 0
+OBS M. Micheli
+
+COD W85 1
+OBS R. Mendez
+
+COD W85 2
+OBS J. D. Armstrong
+
+COD W85 3
+OBS P. Breitenstein
+
+COD W85 4
+OBS T. Lister
+
+COD W85 5
+OBS J. M. Perez
+
+COD W85 6
+OBS J. M. Perez-Redondo
+
+COD W85 7
+OBS A. Hale
+
+COD W85 8
+OBS F. Ocana
+
+COD W86 0
+OBS M. Micheli
+
+COD W86 1
+OBS R. Mendez
+
+COD W86 2
+OBS T. Lister
+
+COD W86 3
+OBS J. D. Armstrong
+
+COD W86 4
+OBS W. Thuillot
+
+COD W86 5
+OBS K. Ly
+
+COD W86 6
+OBS A. Hale
+
+COD W87 0
+OBS M. Micheli
+
+COD W87 1
+OBS J. D. Armstrong
+
+COD W87 2
+OBS T. Lister
+
+COD W87 3
+OBS R. Mendez
+
+COD W87 4
+OBS A. Hale
+
 COD W88 1
 OBS A. J. Evans
 
@@ -4009,6 +4507,9 @@ OBS C. J. R. McEwing
 COD W88 ^
 OBS C. A. Botha
 
+COD W88 _
+OBS E. Ejarque
+
 COD W98 1
 OBS R. Reszelewski
 
@@ -4021,6 +4522,75 @@ OBS M. Kusiak
 COD W98 4
 OBS M. Zolnowski
 
+COD X06 0
+OBS D. Husar
+
+COD X06 1
+OBS L. Demetz
+
+COD X06 2
+OBS J. Jahn
+
+COD X06 3
+OBS D. De Martin
+
+COD X06 4
+OBS J. Camarasa
+
+COD X06 5
+OBS P. VanWylen
+
+COD X07 0
+OBS H. Sato
+
+COD X07 1
+OBS F. D. Romanov
+
+COD X07 2
+OBS M. Suzuki
+
+COD X07 3
+OBS T. Prystavski
+
+COD X07 4
+OBS N. Falla
+
+COD X07 5
+OBS D. Ruhela
+
+COD X07 6
+OBS W. Clark
+
+COD X07 7
+OBS G. Gasparovic
+
+COD X07 8
+OBS M. Mattiazzo
+
+COD X07 9
+OBS T. Lovejoy
+
+COD X07 !
+OBS T. Garrel
+
+COD X07 "
+OBS Z. Wang
+
+COD X07 #
+OBS N. James
+
+COD X07 $
+OBS V. Grossi
+
+COD X07 %
+OBS J.-C. Merlin
+
+COD X07 &
+OBS K. Yoshimoto
+
+COD X07 '
+OBS J. Jahn
+
 COD Z18 1
 OBS M. Micheli
 
@@ -4045,6 +4615,63 @@ OBS L. Palaversa
 COD Z23 1
 OBS M. Micheli
 
+COD Z24 0
+OBS M. Micheli
+
+COD Z24 1
+OBS R. Mendez
+
+COD Z24 2
+OBS J. D. Armstrong
+
+COD Z24 3
+OBS W. Thuillot
+
+COD Z24 4
+OBS T. Lister
+
+COD Z24 5
+OBS A. Hale
+
+COD Z28 0
+OBS D. Husar
+
+COD Z28 1
+OBS J. Jahn
+
+COD Z28 2
+OBS L. Demetz
+
+COD Z28 3
+OBS D. De Martin
+
+COD Z28 4
+OBS N. Paul
+
+COD Z28 5
+OBS T. Kessler
+
+COD Z28 6
+OBS C. Brun-Franc
+
+COD Z28 7
+OBS J. Camarasa
+
+COD Z31 0
+OBS M. Micheli
+
+COD Z31 1
+OBS J. D. Armstrong
+
+COD Z31 2
+OBS T. Lister
+
+COD Z31 3
+OBS P. Breitenstein
+
+COD Z31 4
+OBS F. Ocana
+
 COD Z58 1
 OBS M. Micheli
 
@@ -4052,7 +4679,10 @@ COD Z58 2
 OBS F. Ocana
 
 COD Z58 3
-OBS TBT automatic pipeline
+OBS A. ESA Pipeline
+
+COD Z58 4
+OBS H. ESA Pipeline
 
 COD Z84 1
 OBS M. Micheli
@@ -4071,3 +4701,9 @@ OBS L. Conversi
 
 COD Z84 6
 OBS R. Kresken
+
+COD Z84 7
+OBS F. Ocana
+
+COD Z84 8
+OBS H. ESA Pipeline
diff --git a/rheader.htm b/rheader.htm
index b1094b2b..4fb11a62 100644
--- a/rheader.htm
+++ b/rheader.htm
@@ -9,15 +9,24 @@
    <META http-equiv=Content-Type content="text/html; charset=utf-8">
    <style type="text/css">
    .neocp {color:black; background-color:black; text-decoration:blink;}
+   .whtext {color:white;}
    </style>
 </HEAD>
 <BODY>
 
 <P><b>  "Pseudo-MPEC" for $Name$ </b></p>
+
 <p><i> Created $Tg$ UT using <a href="https://www.projectpluto.com/find_orb.htm">Find_Orb</a></i></p>
+<p><i> <a href="https://www.projectpluto.com/mpec_xpl.htm"> Click here for an
+   explanation of pseudo-MPECs </a> </i> </p>
+
 $Error      # The server flavor of Find_Orb inserts error messages here.
 <ul>
 <li> <a href="#ast_xx"> астрометрия </a> </li>
+# neocp_only 1    These lines only make sense for NEOCP objects:
+<li> <a href="https://cgi.minorplanetcenter.net/cgi-bin/showobsorbs.cgi?Obj=$Name$&amp;obs=y"> Astrometry (from NEOCP,  if available) </a> </li>
+<li> <a href="https://cneos.jpl.nasa.gov/scout/#/object/$Name$"> 'Scout' (JPL) information </a> </li>
+# neocp_only 0
 <li> <a href="#stations"> Observing stations </a> </li>
 <li> <a href="#elements_xx"> Элементы орбиты </a> </li>
 <li> <a href="#residuals_xx"> Residuals </a> </li>
@@ -28,22 +37,10 @@
 <li> <a href="http://skyview.gsfc.nasa.gov/cgi-bin/skymorph/mobssel.pl?target=&amp;Spacewatch=on&amp;OE_EPOCH=$EpJD$&amp;OE_EC=$ecc$&amp;OE_QR=$q$&amp;OE_TP=$T$&amp;OE_OM=$Node$&amp;OE_W=$Peri$&amp;OE_IN=$Incl$&amp;OE_H=$H$"> Click here to search Spacewatch images for this object using Skymorph </a> </li>
 # helio_only 0
 </ul>
-# helio_only 1
-<FORM METHOD="POST" ACTION="http://www.astroarts.com/simulation/cometary-orbit.php">
 <p>
-    <INPUT TYPE="hidden" NAME="NAME" VALUE="$Name$">
-    <INPUT TYPE="hidden" NAME="TYEAR" VALUE="$Ty$">
-    <INPUT TYPE="hidden" NAME="TMONTH" VALUE="$Tm$">
-    <INPUT TYPE="hidden" NAME="TDAY" VALUE="$Td$">
-    <INPUT TYPE="hidden" NAME="PERI" VALUE="$Peri$">
-    <INPUT TYPE="hidden" NAME="E"    VALUE="$ecc$">
-    <INPUT TYPE="hidden" NAME="NODE" VALUE="$Node$">
-    <INPUT TYPE="hidden" NAME="Q"     VALUE="$q$">
-    <INPUT TYPE="hidden" NAME="INCL"  VALUE="$Incl$">
-    <INPUT TYPE="hidden" NAME="EQUINOX" VALUE="$Eqnx$">
-    <INPUT TYPE="submit" VALUE=" Show Orbit in OrbitViewer " NAME="SHOW">
-</p> </FORM>
+<input type = "button" value = "Orbit Simulator View" onclick = "window.open('http://orbitsimulator.com/gravitySimulatorCloud/yr/gsim2023.html?sv,1,$SV$')">
+</p>
 # helio_only 0
-<pre>
-<a name="ast_xx"></a><b>астрометрия:</b>
-(End of header)
+<pre> <a name="ast_xx"></a>
+<a href="https://www.projectpluto.com/mpec_xpl.htm#astrometry"> <b>астрометрия:</b> </a>
+# End of header
diff --git a/roots.cpp b/roots.cpp
index 8c6a3377..5c3ffec5 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -42,29 +42,29 @@ Redefine MAX_POLY_ORDER if this is a problem.
    It works via a recursive process:  it finds the real roots of the
 _derivative_ of the polynomial.  (Therefore,  if you call this function
 with an eighth-degree polynomial,  it will internally generate the
-seventh-degree derivative polynomial,  find the real roots of that,
-which will mean finding the roots of a sixth-degree polynomial, and so
-on. As you'll see,  this eventually works down to a first-degree
-polynomial, a.k.a. a linear equation,  which is trivially solved without
-recursion.)
+seventh-degree derivative polynomial.  Finding the real roots of that
+will mean finding the roots of a sixth-degree polynomial, and so on.
+As you'll see,  this eventually works down to a first-degree
+polynomial, a.k.a. a linear equation,  which is trivially solved
+without recursion.)
 
    Anyway,  the "real roots of the derivative of the polynomial" are also
 known as the minima/maxima of the polynomial.  We can know as a fact that
-all real roots of the polynomial lie between these maxima/minima.  So the
-code evaluates the polynomial at each maximum/minimum;  if its value goes
-through a sign change between consecutive maxima/minima, we've got a root
+all real roots of the polynomial lie between these extrema.  So the
+code evaluates the polynomial at the extrema.  If the polynomial goes
+through a sign change between consecutive extrema,  we've got a root
 bracketed and can use find_poly_root_between() to nail it down precisely
 with the method of Laguerre.
 
-   One odd thing has to be done here,  though.  There are maxima/minima at
-+/- infinity,  too.  So if we find,  say,  three minima at x1 <= x2 <= x3,
+   One odd thing has to be done here,  though.  There are extrema at +/-
+infinity,  too.  So if we find,  say,  three extrema at x1, x2,  and x3,
 then there may be roots between (x1, x2) and (x2, x3), plus roots between
 -inf and x1 and between x3 and +inf.  Since an infinite limit is awkward,
 we find a limit on the possible magnitude of all roots, due to Cauchy
 (see below).  (Plus another limit I came up with,  which turned out to be
 a "rediscovery" of a limit from Donald Knuth's _The Art of Programming_.
 Knuth's limit is frequently smaller than Cauchy's... but not always,  so
-it pays to check them both.)  In general, if we find N minima/maxima,
+it pays to check them both.)  In general, if we find N extrema,  and
 then add in the two determined via Cauchy or Knuth,  there will be N+1
 ranges between them to search.  If the polynomial has all real roots,
 then every one of those ranges will bracket a root.
@@ -134,6 +134,11 @@ static inline double evaluate_poly_and_derivs( const double *poly,
    return( poly[0] + x * (poly[1] + rval * x));
 }
 
+static inline int same_signs( const double a, const double b)
+{
+   return( (a <= 0. && b <= 0.) || (a >= 0. && b >= 0.));
+}
+
 #define SEARCH_TOLERANCE 1.e-10
 
 /* find_poly_root_between() looks for a zero of a polynomial between
@@ -181,7 +186,7 @@ static double find_poly_root_between( const double *poly, const int poly_degree,
 
    if( x1 < 0. && x2 > 0.)            /* brackets span zero;  move   */
       {
-      if( y1 * poly[0] > 0.)          /* one end to x=0, y = poly[0] */
+      if( same_signs( y1, poly[0]))          /* one end to x=0, y = poly[0] */
          {
          x1 = 0.;
          y1 = poly[0];
@@ -213,7 +218,7 @@ static double find_poly_root_between( const double *poly, const int poly_degree,
          new_x = -1.;
          }
 
-      if( y1 * new_y > 0.)       /* move lower bound up */
+      if( same_signs( y1, new_y))       /* move lower bound up */
          {
          x1 = new_x;
          y1 = new_y;
@@ -237,7 +242,7 @@ static double find_poly_root_between( const double *poly, const int poly_degree,
 
       iteration++;
       y = evaluate_poly_and_derivs( poly, poly_degree, x, &deriv, &deriv2);
-      if( (y1 < 0. && y < 0.) || (y1 > 0. && y > 0.))
+      if( same_signs( y, y1))
          {
          x1 = x;
          y1 = y;
@@ -309,6 +314,22 @@ static inline double cauchy_upper_root_bound( const double *poly,
    return( 1. + max / fabs( *poly));
 }
 
+/* https://en.wikipedia.org/wiki/Geometrical_properties_of_polynomial_roots
+says that the following bound was "originally given by Lagrange,  but
+attributed to Zassenhaus by Donald Knuth."  It is twice the largest value
+in the sequence
+
+|a(n-1) / a(n)|,  |a(n-2) / a(n)| ^ 1/2,  .... |a(0) / a(n)| ^ 1/n
+
+    The same article mentions that Lagrange improved it by having the bound
+be the sum of the largest two values in the above sequence.  So we could do
+a little better here.  We could do still better by looking for bounds for real
+valued roots;  at present,  we're looking at the bounds for all roots,
+including complex ones we aren't attempting to determine anyway.
+
+   The following code evaluates the logarithms of the above terms,  then
+calls exp( ) to get the actual largest term so that it can be doubled. */
+
 static inline double knuth_upper_root_bound( const double *poly,
                                int poly_degree)
 {
@@ -363,7 +384,7 @@ int find_real_polynomial_roots( const double *poly, int poly_degree,
       double bound = best_upper_root_bound( poly, poly_degree);
       double root, ybound;
 
-      if( poly[0] * poly[degree] > 0.)
+      if( same_signs( poly[0], poly[degree]))
          bound = -bound;
       ybound = evaluate_poly( poly, poly_degree, bound);
       if( bound < 0.)
@@ -406,7 +427,7 @@ int find_real_polynomial_roots( const double *poly, int poly_degree,
 /*       printf( "Range %lf %lf (%lf %lf)\n", x1, x2, y1, y2);    */
                /* Make sure there is root searching to do (i.e.,  there is */
                /* a range to search and a sign change within that range): */
-         if( y1 * y2 <= 0.)
+         if( !same_signs( y1, y2))
             {
             real_roots[n_roots_found++] = find_poly_root_between( poly,
                                   poly_degree, x1, y1, x2, y2);
diff --git a/roottest.cpp b/roottest.cpp
index 3a32ed8f..c539244d 100644
--- a/roottest.cpp
+++ b/roottest.cpp
@@ -127,13 +127,20 @@ static void remove_spaces( char *buff)
 
 int main( const int argc, const char **argv)
 {
-   char poly_text[1000];
+   char poly_text[100];
    double poly[MAX_POLY], roots[MAX_POLY];
    int err_code = -99, i, order = 0, n_roots;
 
    *poly_text = '\0';
    for( i = 1; i < argc; i++)
+      {
+      if( strlen( poly_text) + strlen( argv[i]) >= sizeof( poly_text) - 1)
+         {
+         fprintf( stderr, "Overflow in polynomial buffer;  got\n%s\n", poly_text);
+         return( -1);
+         }
       strcat( poly_text, argv[i]);
+      }
    remove_spaces( poly_text);
    if( *poly_text)
       err_code = extract_full_polynomial( poly_text, poly);
@@ -143,7 +150,7 @@ int main( const int argc, const char **argv)
       printf( "'roottest' will find all _real_ roots of a given polynomial with\n");
       printf( "real coefficients,  guaranteed,  but no complex ones. For example :\n\n");
       printf( "./roottest \"(12 x^2 + x - 1)*(x-2)\"\n");
-      printf( "./roottest +12 * x ^ 3 -23 * x ^ 2 -3 * x+2\n\n");
+      printf( "./roottest \"+12 * x ^ 3 -23 * x ^ 2 -3 * x+2\"\n\n");
       printf( "would both result in finding roots at x=-1/3, x=1/4,  and x=2.\n");
       printf( "Method is described in 'roots.cpp'.\n");
       return( -1);
diff --git a/rovers.txt b/rovers.txt
index 0001c3a4..d64c4c9c 100644
--- a/rovers.txt
+++ b/rovers.txt
@@ -96,7 +96,7 @@ Brb !   5.896093     +43.155552      240       Barbeau
 
 Sud !  33.11952      +20.59777       10        Sudan impact site
 Atl ! -43.2          +12.5       100000        2014 AA impact location
-C5i !+233.51049    +05.19390          10   @10 Chang'e 5-T1 stage impact point
+C5T !+233.51049    +05.19390          10   @10 Chang'e 5-T1 stage impact point
 LCO ! 311.75834      -84.56139        10   @10 LCROSS impact site
 WT1 !  80.9004       +05.5488          0       WT1190F nominal impact point
 
@@ -113,9 +113,11 @@ Bow ! -69.9          +44.01         100        Bowdoinham
 
     The centers of the Sun,  moon,  and planets are treated as 'rovers'.
     (You'll see below Spirit,  Opportunity,  and various other spacecraft
-    set up as 'rovers' on Mars.)
+    set up as 'rovers' on Mars.)  The solar system barycenter can be
+    specified as either (Bar) or (SSB).
 
 Bar !   0.0000       0.00000   +0.00000    @12 SS Barycenter
+SSB !   0.0000       0.00000   +0.00000    @12 SS Barycenter
 Sun !   0.0000       0.00000   +0.00000    @0  Sun
 Mer !   0.0000       0.00000   +0.00000    @1  Mercury
 Ven !   0.0000       0.00000   +0.00000    @2  Venus
@@ -132,39 +134,48 @@ Lun !   0.0000       0.00000   +0.00000    @10 Luna
    at fractions based on the relative masses of the objects. L4 and L5
    are at equilateral triangle points. Perturbations are ignored.  I
    don't expect observations to be made from these points;  this is
-   really so you can compute ephemerides from these locations.  See
-   'environ.dat' for info on how to set up L points for other systems.
-
-SE1 !   0.0000       0.00000   +0.00 @90000031 Sun-Earth L1
-SE2 !   0.0000       0.00000   +0.00 @90000032 Sun-Earth L2
-SE3 !   0.0000       0.00000   +0.00 @90000033 Sun-Earth L3
-SE4 !   0.0000       0.00000   +0.00 @90000034 Sun-Earth L4
-SE5 !   0.0000       0.00000   +0.00 @90000035 Sun-Earth L5
-EM1 !   0.0000       0.00000   +0.00 @90030101 Earth-Moon L1
-EM2 !   0.0000       0.00000   +0.00 @90030102 Earth-Moon L2
-EM3 !   0.0000       0.00000   +0.00 @90030103 Earth-Moon L3
-EM4 !   0.0000       0.00000   +0.00 @90030104 Earth-Moon L4
-EM5 !   0.0000       0.00000   +0.00 @90030105 Earth-Moon L5
-SJ1 !   0.0000       0.00000   +0.00 @90000051 Sun-Jupiter L1
-SJ2 !   0.0000       0.00000   +0.00 @90000052 Sun-Jupiter L2
-SJ3 !   0.0000       0.00000   +0.00 @90000053 Sun-Jupiter L3
-SJ4 !   0.0000       0.00000   +0.00 @90000054 Sun-Jupiter L4
-SJ5 !   0.0000       0.00000   +0.00 @90000055 Sun-Jupiter L5
-
-   Note that ephems generated from these spacecraft require auxiliary
-   files saying where the spacecraft were at a given time.  I don't
-   distribute those files by default,  because (a) some of them are
-   large and (b) you can only go just so far into the future before
-   they may not be entirely accurate.  Should you want ephems for
-   objects as seen from these spacecraft,  or any other spacecraft
-   listed on JPL's Horizons system,  contact me.
-
-Luc !   0.0000       0.00000   +0.00000    @-2 Lucy
+   really so you can compute ephemerides from these locations.  For
+   each point,  the indices for the primary and secondary object are
+   given (moon=10);  then fraction of distance from primary to secondary,
+   and then fraction "along orbit" (non-zero for L4 and L5,  where the
+   value is +/- sqrt(.75) to make the equilateral triangle.)  For
+   example,  EM1 is 84.906% of the way from the earth to the moon.  See
+   'lagrange.c' in the 'junk' repository for mathematical details and
+   code to generate these values for other systems.
+      The '@90xx' numbers are used as an index by Find_Orb.  They
+   have to be unique and over 9000,  but otherwise have no meaning.
+
+SE1 !   0    3 0.98998902 0              @9001 Sun-Earth L1
+SE2 !   0    3 1.01007824 0              @9002 Sun-Earth L2
+SE3 !   0    3 -0.99999823 0             @9003 Sun-Earth L3
+SE4 !   0    3 0.5  0.8660254            @9004 Sun-Earth L4
+SE5 !   0    3 0.5 -0.8660254            @9005 Sun-Earth L5
+EM1 !   3   10 0.84906572  0             @9006 Earth-Moon L1
+EM2 !   3   10 1.16783275  0             @9007 Earth-Moon L2
+EM3 !   3   10 -0.99291206 0             @9008 Earth-Moon L3
+EM4 !   3   10 0.5  0.8660254            @9009 Earth-Moon L4
+EM5 !   3   10 0.5 -0.8660254            @9010 Earth-Moon L5
+SJ1 !   0    5 0.93331933 0              @9011 Sun-Jupiter L1
+SJ2 !   0    5 1.06978454 0              @9012 Sun-Jupiter L2
+SJ3 !   0    5 -0.99944357 0             @9013 Sun-Jupiter L3
+SJ4 !   0    5 0.5  0.8660254            @9014 Sun-Jupiter L4
+SJ5 !   0    5 0.5 -0.8660254            @9015 Sun-Jupiter L5
+
+   Trickery similar to the above gets us the Earth-Moon barycenter.
+   mass(moon) / mass( earth + moon) = 0.01215058.
+
+EMB !   3   10 0.01215058 0              @9016 Earth-Moon barycenter
+
+   The following spacecraft lack MPC observatory codes,  but either
+   have provided astrometry (though not to MPC) or might do so.
+
 SoO !   0.0000       0.00000   +0.00000    @-2 Solar Orbiter
 PSP !   0.0000       0.00000   +0.00000    @-2 Parker Space Probe
 Cas !   0.0000       0.00000   +0.00000    @-2 Cassini
-JWT !   0.0000       0.00000   +0.00000    @-2 James Webb Space Telescope
 MEx !   0.0000       0.00000   +0.00000    @-2 Mars Express
+Goe !   0.0000       0.00000   +0.00000    @-2 GOES-19
+SWF !   0.0000       0.00000   +0.00000    @-2 Space Weather Follow-On L1
+MRO !   0.0000       0.00000   +0.00000    @-2 Mars Reconnaissance Orbiter
 
 Met !   7.212778     +51.520802       54       Bernd Brinkmann meteor site
 JSt !   8.32         +52.02          300       Joerg Strunk meteor site
@@ -264,32 +275,36 @@ Daw !   0.0000       0.00000   +0.00000    @10 Dawn spacecraft
    Updated 2020 Mar 12 using data from the Mars24 clock program,
    https://www.giss.nasa.gov/tools/mars24/ .  Note that it gives remarks
    about significant disagreements in positions between sources.  East
-   longitudes are positive,  as on Earth.
-Spi ! 175.47848      -14.571892        0   @4  Spirit
-Opp ! 354.47417      -01.9483          0   @4  Opportunity
-MSL ! 137.441635     -04.589465        0   @4  MSL (Curiosity)
-InS ! 135.623447     +04.502384        0   @4  Mars InSight
-Pho ! 234.24845      +68.21878         0   @4  Phoenix lander, Mars
-Pat ! 326.74576      +19.09985         0   @4  Mars Pathfinder
-Vk1 ! 312.04863      +22.2715          0   @4  Viking 1
-Vk2 ! 134.2803       +47.6698          0   @4  Viking 2
+   longitudes are positive,  as on Earth.  Positions given with altitudes
+   are from JPL _Horizons_ (entered 2023 Nov 26).
+Spi !-184.5271       -14.5691999   -2647.5 @4  Spirit
+Opp ! 354.6427098    -02.2554835   -2104.2 @4  Opportunity
+MSL !-222.5583       -04.5894999   -4501.  @4  MSL (Curiosity)
+InS !-224.3765531    +04.5023842   -2613.4 @4  Mars InSight
+Pho !-125.752        +68.219       -4100.  @4  Phoenix lander, Mars
+Pat !-033.2542969    +19.3115308   -4190.7 @4  Mars Pathfinder
+Vk1 !-047.95137      +22.5093139   -3941.7 @4  Viking 1
+Vk2 !-225.719635     +48.0061408   -3365.8 @4  Viking 2
 Be2 !  90.43         +11.53            0   @4  Beagle 2
 ExM ! 353.79         -02.07            0   @4  ExoMars Schiaparelli
-Per !  77.45088572   +18.44462715      0   @4  Perseverance, Mars
-Ti1 ! 110.318        +24.748           0   @4  Tianwen-1 lander, Mars
-ExM ! 335.45         +18.20            0   @4  ExoMars 2022
+Per !-282.5491       +18.4446      -2567.  @4  Perseverance, Mars
+Exf ! 335.45         +18.20            0   @4  ExoMars (future)
 MPL ! 195.3          -76.1             0   @4  Mars Polar Lander
 Ma6 !  19.42         -23.9             0   @4  Mars 6 site
 Ma3 ! 202.           -45.              0   @4  Mars 3 site
 Ma2 !  47.           -45.              0   @4  Mars 2 site
 
-   Following position, measured from an HiRISE image,  is from
-   https://space.stackexchange.com/questions/53586/whats-the-exact-location-lat-lon-of-zhurong
-Zhu ! 109.9249       +25.0644          0   @4  Zhurong landing site
+Zhu ! 109.925        +25.066       -4099.4 @4  Zhurong landing site
 
    In some cases,  viewpoints from the Moon may be useful.
+Ch6 !-153.9852       -41.6385          0   @10 Chang'e 6 lander
+Ch5 ! -51.9161       +43.0576          0   @10 Chang'e 5 lander
 Ch4 ! 177.589        -45.457           0   @10 Chang'e 4 lander
 Ch3 ! -19.5116       +44.1214          0   @10 Chang'e 3 lander
+11a !  23.47307      +00.67344989  -1927.6 @10 Apollo 11 LRRR
+LHD !  62.2129       +12.7142001   -3670.0 @10 Luna-24 landing site
+Su7 ! 348.4873       -40.9811999      81.0 @10 Surveyor 7 landing site
+Cd3 !  32.319        -69.3729998     492.0 @10 Chandrayaan-3 Vikram site
 
 LNA ! -45.896527     -22.01097      1000       LNA (Laboratorio Nacional de Astrofisica)
 
@@ -301,40 +316,54 @@ LNA ! -45.896527     -22.01097      1000       LNA (Laboratorio Nacional de Astr
 
 Jah ! 008.351507     +54.652323       10       Jost Jahn's home observatory
 
-   Coordinates for DSN Stations,  added 2016 Sep 27,  from
+   Coordinates for DSN stations,  added from
+   https://ssd.jpl.nasa.gov/ftp/eph/planets/stations/dsn.itrf93/dsn.itrf93_cartesian_19oct2020.txt
+   and converted from Cartesian coordinates to lat/lon/alt.
+
+d12 !-116.80548923 +35.29993708      962.1551  DSS 12 Goldstone Echo 34-meter
+d13 !-116.79445900 +35.24716424     1070.4438  DSS 13 Goldstone Venus 34-meter
+d14 !-116.88953821 +35.42590087     1001.3206  DSS 14 Goldstone 70-meter
+d15 !-116.88719510 +35.42185328      973.1963  DSS 15 Goldstone 34-meter
+d16 !-116.87364975 +35.34153939      943.9776  DSS 16 Goldstone 26-meter
+d17 !-116.87350536 +35.34217657      936.9160  DSS 17 Goldstone 9-meter
+d24 !-116.87479439 +35.33989280      951.5116  DSS 24 Goldstone 34-meter
+d25 !-116.87536320 +35.33761197      959.6343  DSS 25 Goldstone 34-meter
+d26 !-116.87301642 +35.33568918      968.6932  DSS 26 Goldstone 34-meter
+d27 !-116.77665045 +35.23827178     1052.4689  DSS 27 Goldstone 34-meter
+d28 !-116.77889117 +35.23827202     1064.6481  DSS 28 Goldstone 34-meter
+d34 ! 148.98196443 -35.39847884      692.0204  DSS 34 Canberra 34-meter
+263 ! 148.98145576 -35.39579552      694.8893  Canberra DSS 35
+264 ! 148.97854426 -35.39510176      685.5055  Canberra DSS 36
+d42 ! 148.98126740 -35.40067464      674.6155  DSS 42 Canberra 34-meter
+265 ! 148.98126731 -35.40242423      688.7973  Canberra DSS 43
+d45 ! 148.97768563 -35.39845769      674.3329  DSS 45 Canberra 34-meter
+d46 ! 148.98308169 -35.40501064      676.8121  DSS 46 Canberra 26-meter
+d49 ! 148.26351559 -32.99839901      414.8151  DSS 49 Parkes
+d54 !  -4.25409682 +40.42562168      837.0518  DSS 54 Madrid 34-meter
+d56 !  -4.25206069 +40.42596469      835.7366  DSS 56 Madrid 34-meter
+d55 !  -4.25263330 +40.42429590      819.0613  DSS 55 Madrid 34-meter
+d61 !  -4.24902224 +40.42873917      840.4264  DSS 61 Robledo 34-meter
+d63 !  -4.24800854 +40.43120975      864.7465  DSS 63 Robledo 70-meter
+d65 !  -4.25069890 +40.42720636      833.8398  DSS 65 Madrid 34-meter
+
+   From the same file : these three radiotelescopes were moved or raised,
+   and the previous positions are given below.
+
+d1b !-116.80548923 +35.29993708      959.1071  DSS 12 Goldstone Echo 26-meter (before Oct 1978)
+d6a !  -4.24902224 +40.42873917      837.3783  DSS 61 Robledo 26-meter (before August 1979)
+d6e !  -4.25141796 +40.42718512      833.8158  DSS 65 Madrid 34-meter (before March 2005)
+
+
+   Coordinates for these four DSN Stations were given in
    ftp://ssd.jpl.nasa.gov/pub/eph/planets/stations/dsn.itrf93/dsn.itrf93_geodetic_19sep2016.txt
-   Similar degree/minute/second formatting as with (273) EISCAT above.
+   but apparently dropped in the above 2020 version.  Similar
+   degree/minute/second formatting as with (273) EISCAT above.
 
         longitude    latitude       height
       DDDmmss.sssss   DDmmss.sssss       (m)
-d12 ! 2431140.23879  +351759.77350   962.15503 DSS 12 Goldstone Echo 34-meter
-d13 ! 2431219.94762  +351449.79132  1070.44450 DSS 13 Goldstone Venus 34-meter
-d14 ! 2430637.66245  +352533.24313  1001.39054 DSS 14 Goldstone 70-meter
-d15 ! 2430646.09763  +352518.67180   973.21110 DSS 15 Goldstone 34-meter
-d16 ! 2430734.86091  +352029.54181   943.97719 DSS 16 Goldstone 26-meter
-d17 ! 2430735.38070  +352031.83568   936.91591 DSS 17 Goldstone 9-meter
 d23 ! 2430737.69313  +352022.38127   945.35142 DSS 23 Goldstone 11-meter
-d24 ! 2430730.74021  +352023.61408   951.51136 DSS 24 Goldstone 34-meter
-d25 ! 2430728.69246  +352015.40307   959.63401 DSS 25 Goldstone 34-meter
-d26 ! 2430737.14089  +352008.48104   968.69315 DSS 26 Goldstone 34-meter
-d27 ! 2431324.05839  +351417.77841  1052.46882 DSS 27 Goldstone 34-meter
-d28 ! 2431315.99178  +351417.77927  1064.64775 DSS 28 Goldstone 34-meter
 d33 ! 1485859.13040  -352401.74505   684.09999 DSS 33 Canberra 11-meter
-d34 ! 1485855.07192  -352354.52383   692.02036 DSS 34 Canberra 34-meter
-d35 ! 1485853.24074  -352344.86387   694.88925 DSS 35 Canberra 34-meter
-d36 ! 1485842.75932  -352342.36634   685.50534 DSS 36 Canberra 34-meter
-d42 ! 1485852.56264  -352402.42868   674.61529 DSS 42 Canberra 34-meter
-d43 ! 1485852.56232  -352408.72724   688.86727 DSS 43 Tidbinbilla 70-meter
-d45 ! 1485839.66828  -352354.44767   674.34745 DSS 45 Canberra 34-meter
-d46 ! 1485859.09407  -352418.03830   676.81253 DSS 46 Canberra 26-meter
-d49 ! 1481548.65612  -325954.23645   414.81554 DSS 49 Parkes
 d53 ! 3554501.25220  +402538.48625   826.79158 DSS 53 Madrid 11-meter
-d54 ! 3554445.25142  +402532.23806   837.05188 DSS 54 Madrid 34-meter
-d55 ! 3554450.52012  +402527.46526   819.06158 DSS 55 Madrid 34-meter
-d56 ! 3554452.58152  +402533.48293   835.86840 DSS 56 Madrid 34-meter
-d61 ! 3554503.51994  +402543.46101   840.42622 DSS 61 Robledo 34-meter
-d63 ! 3554507.16925  +402552.35510   864.81685 DSS 63 Robledo 70-meter
-d65 ! 3554457.48397  +402537.94289   833.85442 DSS 65 Madrid 34-meter
 d66 ! 3554454.89654  +402547.90955   849.87404 DSS 66 Madrid 26-meter
 
    The coordinates supplied for these stations by the MPC are
@@ -351,13 +380,26 @@ d66 ! 3554454.89654  +402547.90955   849.87404 DSS 66 Madrid 26-meter
 253 ! 2430637.66245  +352533.24313  1001.39054 Goldstone DSS 14, Fort Irwin
 257 ! 2430728.69246  +352015.40307   959.63401 Goldstone DSS 25, Fort Irwin
 
+   These coordinates came from JPL's radar API.  The MPC file has slightly
+   bad positions.  Their position for Haystack is 47 meters to the west and
+   39 meters higher than that given by JPL.  Evpatoria has a 9-m horizontal
+   difference and six vertically;  Green Bank is two meters off horizontally
+   and three vertically.  (I would expect JPL's coordinates to be accurate.)
+   DSS-74 currently lacks an official observatory code.
+
+254 !-071.488161     +42.623297      116.69    Haystack (37-m)
+255 ! 033.186954     +45.189153       69.      Yevpatoriya
+256 !-079.8398386    +38.4331291     823.64    Green Bank
+d74 ! 133.8098322    -31.8676903     164.66    Ceduna 30-m, UTAS
+d86 ! 138.3627624    +36.1324029    1532.72    Usuda 64-m, JAXA
+
    Coordinates for Cerro Tololo and Cerro Pachon telescopes,  from
    https://arxiv.org/abs/1210.1616 , Table 6.  Note that some positions
    given here don't match those given by MPC's ObsCodes.html.  In
    particular,  the location for (I33) given by MPC is about half a
-   kilometer west of reality (compared to the above reference,  and
-   the map at http://www.ctio.noao.edu/soar/content/location , and
-   inspection on G__gle Maps).  I am reasonably sure that (I02) 2MASS,
+   kilometer west of reality (compared to the above reference,  and the
+   map and lat/lon given at https://noirlab.edu/science/images/soar-map,
+   and inspection on G__gle Maps).  I am reasonably sure that (I02) 2MASS,
    and five LCO telescopes are among those listed below,  but matching
    up the telescopes listed below to their MPC codes is difficult;
    the area is a packed array of domes,  and the MPC coordinates are
@@ -448,48 +490,52 @@ SST ! -70.732371     -29.263556     2397       Swedish-ESO Submillimetre (SEST),
    making up the VLT;  it also gives lat/longs for the many auxiliary
    telescopes.  However,  they're all given as being at 2635.43 meters
    above sea level.  The geoid height is 33.91 meters for UT1 (using
-   EGM96),  resulting in an ellipsoidal height of 2369.34 meters.
+   EGM96),  resulting in an ellipsoidal height of 2669.34 meters.
    I'll go with that until we get better data...
    Incidentally,  there are actually four 1.8-m auxiliary telescopes.
    But they can be moved to any of the thirty locations CPA0 to CPM0
    given below.
-
-UT1 ! -702418.27     -243739.44     2369.34    VLT UT1 (Antu)
-UT2 ! -702417.39     -243737.80     2369.34    VLT UT2 (Kueyen)
-UT3 ! -702416.32     -243736.64     2369.34    VLT UT3 (Melipal)
-UT4 ! -702414.25     -243737.36     2369.34    VLT UT4 (Yepun)
-VST ! -702414.27     -243734.79     2369.34    VLT VST
-VIST! -702351.36     -243656.52     2369.34    VLT VISTA
-CPA0! -702418.44     -243740.59     2369.34    VLT A0
-CPA1! -702418.26     -243741.08     2369.34    VLT A1
-CPB0! -702418.17     -243740.50     2369.34    VLT B0
-CPB1! -702417.99     -243740.99     2369.34    VLT B1
-CPB2! -702417.89     -243741.24     2369.34    VLT B2
-CPB3! -702417.80     -243741.48     2369.34    VLT B3
-CPB4! -702417.71     -243741.73     2369.34    VLT B4
-CPB5! -702417.62     -243741.97     2369.34    VLT B5
-CPC0! -702417.90     -243740.42     2369.34    VLT C0
-CPC1! -702417.72     -243740.91     2369.34    VLT C1
-CPC2! -702417.63     -243741.15     2369.34    VLT C2
-CPC3! -702417.53     -243741.40     2369.34    VLT C3
-CPD0! -702417.36     -243740.25     2369.34    VLT D0
-CPD1! -702416.99     -243741.23     2369.34    VLT D1
-CPD2! -702416.81     -243741.72     2369.34    VLT D2
-CPE0! -702416.83     -243740.08     2369.34    VLT E0
-CPG0! -702416.29     -243739.91     2369.34    VLT G0
-CPG1! -702415.55     -243741.87     2369.34    VLT G1
-CPG2! -702416.57     -243739.18     2369.34    VLT G2
-CPH0! -702415.21     -243739.58     2369.34    VLT H0
-CPI1! -702414.48     -243740.72     2369.34    VLT I1
-CPJ1! -702414.13     -243740.06     2369.34    VLT J1
-CPJ2! -702413.85     -243740.79     2369.34    VLT J2
-CPJ3! -702415.05     -243737.61     2369.34    VLT J3
-CPJ4! -702415.24     -243737.12     2369.34    VLT J4
-CPJ5! -702415.52     -243736.39     2369.34    VLT J5
-CPJ6! -702415.79     -243735.65     2369.34    VLT J6
-CPK0! -702414.14     -243739.24     2369.34    VLT K0
-CPL0! -702413.87     -243739.16     2369.34    VLT L0
-CPM0! -702413.60     -243739.07     2369.34    VLT M0
+   (X11) = VLT Survey Telescope (VST) is omitted.  The MPC location is
+   only six meters lower and one meter away from the position given
+   at the above URL.  (309) is in the midst of UT1, 2, 3, 4,  but its
+   altitude is about 32 meters too low.  I think ObsCodes.html is
+   using a geoid height where it should use an ellipsoidal one.
+
+UT1 ! -702418.27     -243739.44     2669.34    VLT UT1 (Antu)
+UT2 ! -702417.39     -243737.80     2669.34    VLT UT2 (Kueyen)
+UT3 ! -702416.32     -243736.64     2669.34    VLT UT3 (Melipal)
+UT4 ! -702414.25     -243737.36     2669.34    VLT UT4 (Yepun)
+VIST! -702351.36     -243656.52     2669.34    VLT VISTA
+CPA0! -702418.44     -243740.59     2669.34    VLT A0
+CPA1! -702418.26     -243741.08     2669.34    VLT A1
+CPB0! -702418.17     -243740.50     2669.34    VLT B0
+CPB1! -702417.99     -243740.99     2669.34    VLT B1
+CPB2! -702417.89     -243741.24     2669.34    VLT B2
+CPB3! -702417.80     -243741.48     2669.34    VLT B3
+CPB4! -702417.71     -243741.73     2669.34    VLT B4
+CPB5! -702417.62     -243741.97     2669.34    VLT B5
+CPC0! -702417.90     -243740.42     2669.34    VLT C0
+CPC1! -702417.72     -243740.91     2669.34    VLT C1
+CPC2! -702417.63     -243741.15     2669.34    VLT C2
+CPC3! -702417.53     -243741.40     2669.34    VLT C3
+CPD0! -702417.36     -243740.25     2669.34    VLT D0
+CPD1! -702416.99     -243741.23     2669.34    VLT D1
+CPD2! -702416.81     -243741.72     2669.34    VLT D2
+CPE0! -702416.83     -243740.08     2669.34    VLT E0
+CPG0! -702416.29     -243739.91     2669.34    VLT G0
+CPG1! -702415.55     -243741.87     2669.34    VLT G1
+CPG2! -702416.57     -243739.18     2669.34    VLT G2
+CPH0! -702415.21     -243739.58     2669.34    VLT H0
+CPI1! -702414.48     -243740.72     2669.34    VLT I1
+CPJ1! -702414.13     -243740.06     2669.34    VLT J1
+CPJ2! -702413.85     -243740.79     2669.34    VLT J2
+CPJ3! -702415.05     -243737.61     2669.34    VLT J3
+CPJ4! -702415.24     -243737.12     2669.34    VLT J4
+CPJ5! -702415.52     -243736.39     2669.34    VLT J5
+CPJ6! -702415.79     -243735.65     2669.34    VLT J6
+CPK0! -702414.14     -243739.24     2669.34    VLT K0
+CPL0! -702413.87     -243739.16     2669.34    VLT L0
+CPM0! -702413.60     -243739.07     2669.34    VLT M0
 
    Private communication from Peter Birtwhistle. (J95) is at
    a _geoid_ height (from Google Earth) of 105 metres;  this was
@@ -516,13 +562,16 @@ H01 !-1071121.6      +335905.4      3227       Magdalena Ridge Observatory, Soco
 
    https://spacewatch.lpl.arizona.edu/telescopes
 
-   with 30 meters subtracted for geoid height.
+   with 30 meters subtracted for geoid height.  (695) corresponds to
+   the 0.7-m Solar Vacuum Telescope and should probably be moved,  but
+   I don't know where.
 
 291 !-111.599905     +31.961669     2045.      LPL/Spacewatch II
 
    Other scopes measured while looking at Kitt Peak in Google Earth.
-   https://www.noao.edu/kpno/usrhnbk/mtn.gif used to ID most telescopes.
-   30m subtracted to get ellipsoidal altitudes.
+   https://www-kpno.kpno.noirlab.edu/usrhnbk/mtn.gif used to ID most
+   scopes.  30m subtracted to get ellipsoidal altitudes.  I omitted the 2.3-m
+   Bok telescope,  because it has code (V00) and is fairly well placed.
 
 May !-111.599895     +31.964027     2051.      Mayall telescope,  Kitt Peak
 1.3 !-111.598406     +31.959634     2042.      1.3-m RCT telescope, Kitt Peak
@@ -541,12 +590,10 @@ Unk3!-111.602183     +31.958133     2058.      Roll-off roof W of WIYN,  Kitt Pe
 12m !-1113653.475    +315712.0      1884.      ARO 12 Meter Telescope
 
    The MDM Observatory at Kitt Peak has the 1.3-m McGraw-Hill Telescope and
-   the 2.4-m Hiltner Telescope,  separated by roughly 60 meters. The MPC
-   coordinates for (697) appear to come from
-   http://mdm.kpno.noao.edu/13_manual/mgh03.html , and are given to arcminute
-   precision,  about 1.5 km from the positions below. I've measured both scopes
-   on Google Maps;  Eric Galayda provided altitudes and IDs as to which scope was
-   which (not really apparent otherwise). As with other Kitt Peak scopes, 30
+   the 2.4-m Hiltner Telescope,  separated by roughly 60 meters.
+   I've measured both scopes on Google Maps;  Eric Galayda provided
+   altitudes and IDs as to which scope was which (not really apparent
+   from just looking at Google Maps). As with other Kitt Peak scopes, 30
    meters is subtracted from the geoid heights to get ellipsoidal heights.
 
 Hil !-111.615864     +31.951503     1908.5     Kitt Peak, Hiltner
@@ -583,8 +630,8 @@ J13 ! -17.8792       +28.7624       2403       Liverpool Telescope, Canary Islan
    = 30m precision,  so I'm sticking to G__gle Maps for that part.
 Z18 ! -175330.8      +284523.8      2340       Gran Telescopio Canarias
 Z20 ! -17.878484     +28.762366     2373       Mercator Telescope, Canary Islands
-Ma1 ! -17.890588     +28.761325     2271.38    MAGIC (southwest)
-Ma2 ! -17.890085     +28.761963     2271.38    MAGIC (northeast)
+MA1 ! -17.890588     +28.761325     2271.38    MAGIC (southwest)
+MA2 ! -17.890085     +28.761963     2271.38    MAGIC (northeast)
 
    Various telescopes near JKT can be identified from
    http://www.ing.iac.es/PR/visits/mapaorm.png (WARNING: South is _up_),
@@ -728,8 +775,8 @@ Nar !  98.4856944    +18.589972     2559       NARIT, Chiangmai
    used to report (204) data,  but has been discontinued.  Luca tells me
    (Sc3),  a smaller dome between the two,  houses a C14 that will be
    remotely controlled in early 2021 (hasn't actually submitted any data).
+   MPC corrected their position for (204) in early 2024.
 
-204 !   8.76993      +45.86833      1278       Schiaparelli Observatory, 0.85-m scope
 Sc2 !   8.77061      +45.86845      1278       Schiaparelli Observatory, 0.60-m scope
 Sc3 !   8.77027      +45.86853      1278       Schiaparelli Observatory, C14
 
@@ -741,12 +788,17 @@ G34 !  13.701403     +50.860289      490.67    Oberfrauendorf
    is 155 metres above sea level;  the geoid height is about 46 metres.
    (J69) is one of five domes visible on G__gle Earth as part of the
    Hampshire Astronomical Group site.  The altitudes appear to be identical.
+   Further identification is given at https://hantsastro.org.uk/tour/index.php
+   (comments come from that page).
 
 J69 !  -1.0196556    +50.9390167     201       North Observatory, Clanfield
-Ha1 !  -1.019663     +50.939114      201       HAG about 10m north of (J69)
-Ha2 !  -1.019629     +50.938673      201       HAG about 40m south of (J69)
-Ha3 !  -1.019306     +50.938298      201       HAG smaller dome ~85m SSE of (J69)
-Ha3 !  -1.019140     +50.938284      201       HAG larger dome ~85m SSE of (J69)
+Cdi !  -1.019663     +50.939114      201       12" Dome, Clanfield
+   "This dome is privately owned... 12-inch f5.5 Newtonian... for imaging"
+J84 !  -1.019629     +50.938673      201       South Observatory, Clanfield
+C7i !  -1.019306     +50.938298      201       7" Dome,  Clanfield
+   "...the favourite amongst members for astronomical imaging"
+C5i !  -1.019140     +50.938284      201       5" Dome,  Clanfield
+   "The oldest of our telescopes are housed in this dome"
 
    Some telescopes at (711) McDonald Observatory in Texas,  sorted using the
    site map at http://www.as.utexas.edu/mcdonald/observers/mcd_site_map.pdf
@@ -782,9 +834,9 @@ FL2 !-110.878488   +31.680868       2287.949   Whipple Observatory,  1.2-m
    (Z84) and (Z79) were identifiable.  I _think_ (G36) = Un1.  Alts are from
    G__gle Earth,  with 51m added for geoid height.  According to Wikipaedia,
    (Z79) = 3.5m scope;  (Z84) = 0.8-m Schmidt; (Un1) = 1.23m;  (Un2) = 1.5m;
-   (Un3) = 2.2m.
+   (Un3) = 2.2m. Z84 is removed from this rovers list as the elevation has
+   been corrected.
 
-Z84 !  -2.548143   +37.223981       2207.      Calar Alto-Schmidt
 Un1 !  -2.547483   +37.223165       2211.      Unknown about 100m SSE of Z84;  (G36)?
 Un2 !  -2.548248   +37.224987       2201.      Unknown about 100m north of Z84
 Un3 !  -2.546037   +37.223133       2112.      Unknown about 200m ESE of Z84
@@ -853,25 +905,44 @@ ELT !-070.191631   -24.589327       3046.      Extremely Large Telescope
 GMT !-0704109.0    -290142.0        2516.      Giant Magellan Telescope
 TMT !-155.4816     +19.8327         4050.      Thirty-Meter Telescope
 
-   Improved coords for both Magellan scopes.  Alt is from
-   https://www.as.arizona.edu/magellan-65m-telescopes (converted from
-   feet,  so treat with caution).  Lat/lons given there are identical
+   Low-precision coordinates given in the May 2025 NEOCC monthly newsletter.
+   Just for interim use;  I assume we'll see accurate coordinates sometime
+   before the scope is operational... as noted in that newsletter,  Flyeye
+   is currently installed in Matera.  That site has obscode (S16).
+Fly !+014.023      +37.868           1850.     Flyeye,  Mt. Mufara
+
+   Improved coords for both Magellan scopes.  The locations given at
+   https://astro.arizona.edu/magellan-telescopes are indentical,  and
    and split the difference between the positions given below,  which
-   were measured on G__gle Maps.
-268 !-070.692620   -29.014044       2515.      New Horizons KBO Search-Magellan/Clay
-269 !-070.692187   -29.014442       2515.      New Horizons KBO Search-Magellan/Baade
-
-   Coords for these two telescopes are provided by Wikipaedia,  claimed good to
-   a meter (though given to 3-m precision?),  and they do land squarely on domes
-   in G__gle Maps.  Many Las Campanas telescopes are unidentified.  The
-   coordinates given for (304) and (I05) are identical and about 500m
-   north of the nearest observatory dome.
-War !-704205.9     -290035.8        2275.      Warsaw Telescope, Las Campanas (OGLE)
-ASA !-704205.1     -290036.9        2275?      All-Sky Automated Survey (ASAS), Las Campanas
-Lc1 !-70.70397     -29.00735                   Las Campanas unk 1, northernmos
-Lc2 !-70.70121     -29.01036                   Las Campanas unk 2, ~25m SE of (ASA)
-Lc3 !-70.70026     -29.01193                   Las Campanas unk 3
-Lc4 !-70.68982     -29.02158                   Las Campanas unk 4
+   were measured on G__gle Earth.  The MPC altitudes match those from
+   Google Earth,  and are probably ground heights uncorrected for
+   geoid height.  The MPC locations are about 70m west of the G__gle
+   ones (used below).  Altitude is that from Google,  with 33m added
+   for geoid height.  The arizona.edu altitude (given in "feet") is
+   ~125m above ground,  which seems unreasonably high.
+268 !-070.692620   -29.014044       2422.      Magellan-Clay Telescope
+269 !-070.692187   -29.014442       2422.      Magellan-Baade Telescope
+
+   Las Campanas telescopes,  from G__gle Earth.  Identifications are from
+   that source,  and from https://www.lco.cl/tenant-telescopes-2/ and hatpi.org.
+   (I05) gives coordinates for the TIE (Telescopes In Education) scope,  about
+   500m north of the nearest observatory dome and probably wrong.  As with the
+   Mt Wilson TIE,  good coordinates are lacking.  The twin Magellan telescopes
+   have codes (268) for the Clay Telescope and (269) for the Baade Telescope.
+   Code (304) is between them;  see MPEC 2024-Y07.  For completeness,  a
+   (GMT) Giant Magellan Telescope code is given above.
+   33m added for geoid height.
+DuP !-70.703986    -29.007334       2310       DuPont Telescope, Las Campanas
+LVa !-70.702690    -29.008345       2301       Vacant dome, Las Campanas
+War !-70.701634    -29.009926       2301       Warsaw Telescope, Las Campanas (OGLE)
+ASA !-70.701209    -29.010365       2303       All-Sky Automated Survey (ASAS), Las Campanas
+HAp !-70.701080    -29.010486       2303       HATPI, Las Campanas
+HAW !-70.700881    -29.010788       2304       HAT South (west dome), Las Campanas
+HAS !-70.700832    -29.010790       2304       HAT South (east dome), Las Campanas
+LVM !-70.700709    -29.010851       2304       Local Volume Mapper Instrument, Las Campanas
+CAS !-70.700538    -29.010986       2305       CASCA,  Las Campanas
+HSw !-70.700236    -29.011994       2308       Henrietta Swope Telescope?,  Las Campanas
+BiS !-70.689787    -29.021614       2370       BiSON,  Las Campanas
 
    Carolin Liefke sorted out the history of (024) Heidelberg-Konigstuhl
    (see https://groups.io/g/mpml/message/35417).  The site listed below as
@@ -1125,7 +1196,7 @@ OHe !+005.712389   +43.932077        780.      SATINO, Observatoire Haute-Proven
 
 576 !+000.374425   +50.995594         118.     Burwash
 984 !-002.739722   +50.922992         101.     Eastfield
-986 !+000.639444   +51.408888         115.     Ascot
+986 !-000.639444   +51.408888         115.     Ascot
 993 !+002.505833   +51.047117         136.     Woolston
 
    Peter's page at https://birtwhistle.org.uk/HistoryMillHill.htm
@@ -1153,7 +1224,7 @@ OHe !+005.712389   +43.932077        780.      SATINO, Observatoire Haute-Proven
    Lowell Observatory scopes.  24m subtracted for geoid height.
    The NPOI location is that at the center of the three 'arms'.  Some IDs
    made using https://lowell.edu/history/the-mars-hill-campus/ .
-Per !-111.536786   +35.097069        2178.     Perkins 1.8-m, Lowell Observatory
+Pek !-111.536786   +35.097069        2178.     Perkins 1.8-m, Lowell Observatory
 Hal !-111.536335   +35.096740        2177.     Hall 1.1-m, Lowell Observatory
 699 !-111.536703   +35.095857        2177.     Lowell Observatory-LONEOS
 NPO !-111.533918   +35.095946        2180.     Navy Precision Optical Interferometer
@@ -1326,7 +1397,7 @@ On6 !+014.78264    +49.91339          559.0    Ondrejov radio telescope (NE)
 On7 !+014.7819072  +49.9090889        580.0    Ondrejov 18cm
 
 McN !+149.15646    -31.27369          610.0    Rob McNaught
-Kau !+024.048722   +54.920805          67.0    Kaunas
+Kau !+024.048889   +54.920931          67.0    Kaunas
 
    The MPC position for Skalnate Pleso is about 600 meters east of the
 one given at https://www.ta3.sk/l3.php?p3=mph (and confirmed on G__gle
@@ -1375,13 +1446,29 @@ AN23!+149.062396   -31.271647        1171.     Australian National Univ 2.3-m, S
 AN16!+149.062227   -31.272120        1183.     Australian National Univ 16-inch, Siding Spring
 AN40!+149.062103   -31.271163        1180.     Australian National Univ 40-inch, Siding Spring
 Q57 !+149.062545   -31.271108        1167.     Korea Microlensing Telescope Network-SSO
+HatS!+149.062060   -31.272295        1174.     HAT-South, Siding Spring
+Sola!+149.061874   -31.272380        1175.     Solaris telescope, Siding Spring
 
 Upp5!+149.064160   -31.273225        1151.     Uppsala 0.5-m, Siding Spring
-ROTS!+149.064252   -31.273447        1148.     UNSW ROTSE Telescope, Siding Spring
 UNSW!+149.064297   -31.273297        1149.     0.5-m UNSW Automated Patrol Telescope
 UKSc!+149.071132   -31.272289        1142.     1.2-m UK Schmidt, Siding Spring
 AAO !+149.067264   -31.275358        1161.     3.9-m Anglo-Australian Telescope, Siding Spring
 
+   Ian Adams provided some "on-the-ground" corrections/additions for
+Siding Spring.  He pointed out the following two GOTO (Gravitational-
+wave Optical Transient Observatory) scopes,  and supplied a corrected
+location for ROTSE (I'd mis-labelled the JAXA observatory as ROTSE) :
+
+GOS !+149.064123   -31.273454        1148.     GOTO South
+GON !+149.064119   -31.273374        1149.     GOTO North
+ROTS!+149.064040   -31.273364        1150.     UNSW ROTSE Telescope, Siding Spring
+
+   Ian also identified a couple of roll-off roof structures in the
+neighborhood that had me baffled :
+
+JAXS!+149.064204   -31.273410        1121      JAXA, Siding Spring
+APT !+149.064281   -31.273343        1122      APT, Siding Spring
+
    Should check in with Las Cumbres folks to disambiguate the following :
 
 Faul!+149.070794   -31.272822        1146.     Faulkes Telescope South?
@@ -1396,13 +1483,8 @@ St74!+149.008898   -35.319125         786.     74-in reflector, Mt Stromlo
 St26!+149.009794   -35.318523         787.     26-in Yale-Columbia refractor, Mt Stromlo
 St50!+149.007461   -35.320406         786.     50-in reflector, Mt Stromlo
 
-   Identified from image at
-   https://www.esa.int/Safety_Security/Planetary_Defence/New_ESA_telescope_in_South_America_to_search_for_asteroids
-
-ET2 !-070.73904    -29.25522         2359.     ESA Test-Bed Telescope 2, La Silla
-
-SSA !+114.0899     -21.8957            40.     Space Surveillance Telescope, Exmouth
-SOR !-106.463864   +34.9642312       1892.     Starfire Optical Range,  Albuqueque
+P07 !+114.0899     -21.8957            40.     Space Surveillance Telescope, HEH Station
+SOR !-106.463864   +34.9642312       1892.     Starfire Optical Range,  Albuquerque
 
    Private communication from Francois Kugel,  2021 Oct 18 : N 43 59' 59.26",
    E 05 38' 48.96", alt 626m ASL.  51m added for geoid height.
@@ -1430,15 +1512,27 @@ P5m !-116.86503    +33.35627         1662.     Palomar 5m
    Coords from Andrea Mattei.
 L78 !+014.780211   +40.6826087        134.     San Marco Observatory, Salerno
 
-   The MPC coordinates for Bucharest are in a pond.  I'm pretty sure one of
+   The MPC coordinates for Bucharest were in a pond.  I thought that one of
    these two domes,  about 60m apart from each other and ~300m south-southwest
-   of the MPC coordinates,  are the "right" place. 37m added for geoid height.
-073 !+026.09487    +44.41095          124.     Bucharest
-073a!+026.09485    +44.41038          134.     Bucharest (southern dome)
+   of the MPC coordinates,  was the "right" place. 37m added for geoid height.
+073a!+026.09487    +44.41095          124.     Bucharest (northern dome)
+073b!+026.09485    +44.41038          134.     Bucharest (southern dome)
+
+   About 180 meters NW of the above pair is a pair of smaller domes,  about
+   20m from each other :
+
+073c!+026.09378    +44.41224          134.     Bucharest (small NE dome)
+073d!+026.09362    +44.41207          134.     Bucharest (small SW dome)
+
+   However,  Adrian Sonka tells me the actual location is none of these;
+   it is a roll-off roof observatory a little southeast of the above pair.
+   (MPC has since 'moved' (073) to these coordinates.)
+073 !+026.09391    +44.41197          134.     Bucharest
 
    The MPC coordinates for Geneva are about 190m north-northeast of the dome
-   as seen on G__gle Maps.  50m added for geoid height.
-517 !+006.13497    +46.30916          512.     Geneva (from 1967)
+   as seen on G__gle Maps.   Corrected location from Stephan Hellmich.
+   50m added for geoid height.
+517 !+006.1349802  +46.3091749        509.     Geneva (from 1967)
 
    The following position is from a GPS survey, from a private communication
    from Mike Nolan.  _Horizons_ uses an almost identical position,  except
@@ -1455,11 +1549,13 @@ UAZ !-110.947361   +32.232722         100.000  University of Arizona 24"
    locations.  The following coordinates came a private communication from
    Jon Giorgini at JPL.
 
-d47 ! 149.5501388  -30.3128846       236.87    DSS 47
+271 ! 149.5501388  -30.3128846       236.87    ATCA DSS 47
 
-   (Opt) is a 'floating' location.  It should be the best topocentric location
-   for observing an object at a given time,  and therefore moves around as the
-   Earth rotates and the object moves around in the sky.
+   (Opt) is a 'floating' location,  used internally in Find_Orb.  It is the
+   'best' topocentric location for observing an object at a given time (puts
+   the object well above the horizon and the sun well below it),  and
+   therefore moves around as the Earth rotates and the object moves around
+   in the sky.
 
 Opt !   0.0000       0.00000   +0.00000    @3  Optimal topocentric location
 
@@ -1471,3 +1567,107 @@ Opt !   0.0000       0.00000   +0.00000    @3  Optimal topocentric location
 LC1 !   0.0000       0.00000   +0.00000    @3  Las Cumbres Observatory (1m)
 LC2 !   0.0000       0.00000   +0.00000    @3  Las Cumbres Observatory (2m)
 ATL !   0.0000       0.00000   +0.00000    @3  ATLAS (all scopes)
+
+RA2 !-110.847070   +32.581105        1190.     RAPTORS-2
+RMI !+145.061634   -37.680589         160.4    RMIT Robotic Optical Observatory
+
+TCO !-156.44052777 +20.7097222         59.0    Tennis Court Observatory, Maui
+
+   Identified some Perth Observatory scopes from an annotated map at
+   http://www.phys.ttu.edu/~ozprof/pobs.htm ,  which also describes some of
+   the scopes at this facility.  Perth has three official MPC codes,  (319),
+   (322),  and (323).  I don't know to which telescopes those last two refer.
+
+Pe1 !+116.13545    -32.00773          355.0    UWA 16" telescope
+319 !+116.13645    -32.00690          355.0    Perth Observatory, Perth-Lowell Telescope
+Pe2 !+116.13607    -32.00710          355.0    Perth Observatory Transit Telescope
+Pe3 !+116.13648    -32.00777          355.0    Perth Observatory 13" Astrograph
+Pe4 !+116.13648    -32.00742          355.0    Perth Observatory unidentified 1
+Pe5 !+116.13663    -32.00716          355.0    Perth Observatory unidentified 2
+Pe6 !+116.13645    -32.00729          355.0    Perth Observatory roll-off roof?
+
+   The MPC location for (662) Lick is about 200 meters east-southeast of the
+   nearest telescope (36" refractor).  I don't know which telescope(s) really
+   corresponds to (662);  I am putting it at the location for the 36"
+   refractor,  which is at least an improvement by ~200 meters.  Site map is
+   https://mthamilton.ucolick.org/techdocs/practical_info/lick_map.html
+   32 meters subtracted for geoid height.
+
+662 !-121.643015   +37.341081        1273.0    Lick Observatory, 36" refractor
+662a!-121.642877   +37.341707        1264.0    Lick Observatory, 40" reflector
+662b!-121.640246   +37.341893        1241.0    Lick Observatory, 22" Touchmann reflector
+662c!-121.638793   +37.342747        1252.0    Lick Observatory, Crocker dome
+662d!-121.638222   +37.342536        1250.0    Lick Observatory, Automatic Planet Finder scope
+662e!-121.638003   +37.342617        1251.0    Lick Observatory, Double Astrograph
+662f!-121.637157   +37.342842        1245.0    Lick Observatory, Coude' Auxiliary telescope
+662g!-121.637209   +37.343034        1246.0    Lick Observatory, 120" Shane telescope
+662h!-121.634823   +37.343376        1265.0    Lick Observatory, Katzman Automatic Imaging telescope
+
+   (672) Mount Wilson scopes identified via
+   https://www.mtwilson.edu/wp-content/uploads/2023/05/MWO-Campus-Map-Printable.pdf
+   The MPC position is at least in the right ballpark,  such that I don't
+   know which way to move it (again,  I don't know which of the following was
+   the "real" (672).)  I've omitted (G73),  the 24" scope used for TIE (Telescopes
+   In Education).  It was moved from Mount Wilson in 2007.  I don't know where it
+   was when it was in use,  but the MPC position is probably about 1.3 km south of
+   reality;  it's way out in the woods.  33 meters subtracted for geoid height.
+
+672a!-118.057487   +34.224572        1695.0    Mount Wilson, 60"
+672b!-118.057186   +34.225873        1690.0    Mount Wilson, 100" Hooker
+672c!-118.057053   +34.224403        1696.0    Mount Wilson, CHARA S1
+672d!-118.057110   +34.224699        1699.0    Mount Wilson, CHARA S2
+672e!-118.058963   +34.226347        1683.0    Mount Wilson, CHARA W1
+672f!-118.057823   +34.226189        1685.0    Mount Wilson, CHARA W2
+672g!-118.055694   +34.227149        1660.0    Mount Wilson, CHARA E1
+672h!-118.056292   +34.226829        1674.0    Mount Wilson, CHARA E2
+
+   Private communication from Gary Hug.  32m subtracted for geoid height.
+
+H36 !-095.706554   +38.797700         322.0    Sandlot Observatory, Scranton
+
+SQO !-086.5263889  +38.97702778       153.0    Star Quarry Observatory
+
+   https://en.wikipedia.org/wiki/Vassar_College_Observatory provides the
+   following position for (794),  and explains that it is the 'historic'
+   observatory.  Positions from (794) in MPC data are all quite old and
+   would have come from this location,  which is about 300 meters west
+   of the MPC coordinates for it.  The new observatory has three domes
+   visible on G__gle Maps;  see
+   https://en.wikipedia.org/wiki/Class_of_1951_Observatory .
+
+794 !-073.89331    +41.68829           55.0    Vassar College Observatory, Poughkeepsie
+VCe !-073.89045    +41.68295           55.0    Vassar College (since 1997), larger east dome
+VCw !-073.89063    +41.68295           55.0    Vassar College (since 1997), larger west dome
+VCn !-073.89054    +41.68323           55.0    Vassar College (since 1997), small north dome
+
+   (Roz) is a new telescope near (071),  described at
+   https://www.ta3.sk/caosp/Eedition/Abstracts/2024/Vol_54/No_2/pp15-21_abstract.html
+   Coordinates for it,  and for (AOB),  are via a private communication
+   from Rositsa Miteva.
+
+Roz !+024.73833    +41.69694         1762.0    1.5-m NAO Rozhen, Smolyan
+AOB !+022.675      +43.622777         650.0    AO Belogradchik
+
+   Gael Musquet supplied the coordinates for the following two telescopes.
+
+VO1 !+001.49914017 +49.103662056      169.222  Vernon Observatory CB
+VO2 !+001.49767872 +49.107084983      170.486  Vernon Observatory L1
+BoR !+007.192566   +51.426990         159.65   Bochum radio observatory
+Cha !+016.11250    -23.290000        1182.0    Chamaeleon Observatory
+
+McC !-078.329166   +44.331944         206.77   Hevans Drive Observatory
+088 !+031.827694   +29.93400          494.0    Kottamia
+OKC !-097.671787   +35.411143         390.0    Oklahoma City test site
+
+   A couple of corrections,  from private communications.
+J04 !-016.511823   +28.300971        2450.     ESA Optical Ground Station, Tenerife
+853 !-110.846731   +32.581173        1166.9    Biosphere 2
+089 !+031.97333    +46.972485          79.     Mykolaiv
+
+   Andrew Pearce and Terry Lovejoy provided these coordinates for the old
+   Perth Observatory.  "(323) represents the Perth Observatory at the
+   current site but before 1966 it was located about 30kms west."  They
+   measured some plates of C/1917 F1 (Mellish) in 2025 (submitted to MPC
+   as 'roving observer' observations).
+
+OPe !-115.8444     -31.9525            70.0    Perth Observatory (before 1966)
diff --git a/runge.cpp b/runge.cpp
index 91956cea..b17af657 100644
--- a/runge.cpp
+++ b/runge.cpp
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <unistd.h>
 #endif
 #include "watdefs.h"
+#include "pl_cache.h"
 #include "lunar.h"
 #include "afuncs.h"
 #include "comets.h"
@@ -36,13 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 #define ldouble long double
 
-#if defined( __WATCOMC__) || defined( __FreeBSD__)
-#define ceill ceil
-#define expl exp
-#define fabsl fabs
-#define isnanl isnan
-#define powl pow
-#define sqrtl sqrt
+      /* OpenWATCOM lacks all long double functions. */
+#ifdef __WATCOMC__
+#define expl      exp
+#define fabsl     fabs
+#define powl      pow
+#define sqrtl     sqrt
 #endif
 
 /* perturbers
@@ -80,8 +80,6 @@ ldouble take_rk_stepl( const ldouble jd, ELEMENTS *ref_orbit,
 ldouble take_pd89_step( const ldouble jd, ELEMENTS *ref_orbit,
                  const ldouble *ival, ldouble *ovals,
                  const int n_vals, const ldouble step);    /* runge.cpp */
-int symplectic_6( double jd, ELEMENTS *ref_orbit, double *vect,
-                                          const double dt);
 int get_planet_posn_vel( const double jd, const int planet_no,
                      double *posn, double *vel);         /* runge.cpp */
 int find_best_fit_planet( const double jd, const double *ivect,
@@ -98,6 +96,7 @@ int parallax_to_lat_alt( const double rho_cos_phi, const double rho_sin_phi,
        double *lat, double *ht_in_meters, const int planet_idx); /* ephem0.c */
 void calc_approx_planet_orientation( const int planet,        /* runge.cpp */
          const int system_number, const double jde, double *matrix);
+void compute_effective_solar_multiplier( const char *constraints);   /* runge.c */
 double geo_potential_in_au( const double x, const double y, const double z,
                  double *derivs, const int n_terms);    /* geo_pot.c */
 double shadow_check( const double *planet_loc,           /* ephem0.cpp */
@@ -209,20 +208,22 @@ static void vector_cross_productl( ldouble *xprod, const ldouble *a, const ldoub
 #define ATMOSPHERIC_LIMIT (EARTH_RADIUS_IN_AU + 500. / AU_IN_KM)
 /* #define ATMOSPHERIC_LIMIT 0      */
 
-/*  Jupiter field is now from doi:10.1038/nature25776, "Measurement of
-Jupiter's asymmetric gravity field".   Saturn,  Uranus, and Neptune
-fields are from http://ssd.jpl.nasa.gov/?gravity_fields_op .*/
+/*  Jupiter,  Saturn,  Uranus, and Neptune fields are from
+https://ssd.jpl.nasa.gov/tools/gravity.html#/outerplanets .*/
 
-#define J2_IN_JUPITER_UNITS (.0146956572)      /* +/- 1.4e-8 */
-#define J3_IN_JUPITER_UNITS (-0.042e-6)        /* +/- 0.010e-6 */
-#define J4_IN_JUPITER_UNITS (-5.86609e-4)      /* +/- 4e-8 */
+#define J2_IN_JUPITER_UNITS (.014695735)      /* +/- 1.7e-9 */
+#define J3_IN_JUPITER_UNITS (-0.045e-6)        /* +/- 0.0033e-6 */
+#define J4_IN_JUPITER_UNITS (-5.866085e-4)      /* +/- 2.4e-9 */
 #ifdef NOT_USING_ANYTHING_PAST_J4_YET
-   #define J5_IN_JUPITER_UNITS   (-6.9e-8)     /* +/- 0.8e-8 */
-   #define J6_IN_JUPITER_UNITS   34.198e-6     /* +/- 0.9e-8 */
-   #define J7_IN_JUPITER_UNITS   1.24e-7       /* +/- 0.17e-7 */
+   #define J5_IN_JUPITER_UNITS   (-0.0723e-6)     /* +/- 0.0042e-6 */
+   #define J6_IN_JUPITER_UNITS   34.2007e-6     /* +/- 0.0067e-6 */
+   #define J7_IN_JUPITER_UNITS   0.120e-6       /* +/- 0.012e-6 */
+   #define J8_IN_JUPITER_UNITS   (-2.422e-6)    /* +/- 0.021e-6 */
 
-   #define J6_IN_SATURN_UNITS    86.14e-6
-   #define J8_IN_SATURN_UNITS   -10.e-6
+   #define J6_IN_SATURN_UNITS    86.8e-6
+   #define J8_IN_SATURN_UNITS   -13.9e-6
+
+   #define J6_IN_NEPTUNE_UNITS    0.5e-6
 #endif
 #define JUPITER_R (71492. / AU_IN_KM)
 #define JUPITER_R2 (JUPITER_R * JUPITER_R)
@@ -230,25 +231,25 @@ fields are from http://ssd.jpl.nasa.gov/?gravity_fields_op .*/
 #define JUPITER_J3 (J3_IN_JUPITER_UNITS * JUPITER_R2 * JUPITER_R)
 #define JUPITER_J4 (J4_IN_JUPITER_UNITS * JUPITER_R2 * JUPITER_R2)
 
-#define J2_IN_SATURN_UNITS (.01629071)
-#define J4_IN_SATURN_UNITS (-.00093583)
+#define J2_IN_SATURN_UNITS (.0162906)
+#define J4_IN_SATURN_UNITS (-.0009351)
 #define SATURN_R (60330. / AU_IN_KM)
 #define SATURN_R2 (SATURN_R * SATURN_R)
 #define SATURN_J2 (J2_IN_SATURN_UNITS * SATURN_R2)
 #define SATURN_J3 0.
 #define SATURN_J4 (J4_IN_SATURN_UNITS * SATURN_R2 * SATURN_R2)
 
-#define J2_IN_URANUS_UNITS  3510.68e-6
-#define J4_IN_URANUS_UNITS   -34.17e-6
+#define J2_IN_URANUS_UNITS  3510.7e-6
+#define J4_IN_URANUS_UNITS   -34.2e-6
 #define URANUS_R (25559. / AU_IN_KM)
 #define URANUS_R2 (URANUS_R * URANUS_R)
 #define URANUS_J2 (J2_IN_URANUS_UNITS * URANUS_R * URANUS_R)
 #define URANUS_J3 0.
 #define URANUS_J4 (J4_IN_URANUS_UNITS * URANUS_R2 * URANUS_R2)
 
-#define J2_IN_NEPTUNE_UNITS  3408.43e-6
-#define J4_IN_NEPTUNE_UNITS   -33.40e-6
-#define NEPTUNE_R (25225. / AU_IN_KM)
+#define J2_IN_NEPTUNE_UNITS  3536.3e-6
+#define J4_IN_NEPTUNE_UNITS   -36.0e-6
+#define NEPTUNE_R (24764. / AU_IN_KM)
 #define NEPTUNE_R2 (NEPTUNE_R * NEPTUNE_R)
 #define NEPTUNE_J2 (J2_IN_NEPTUNE_UNITS * NEPTUNE_R * NEPTUNE_R)
 #define NEPTUNE_J3 0.
@@ -586,15 +587,8 @@ of the planet's pole doesn't change much over that time scale,
 and we don't want to do a lot of expensive recomputes of planet orientation
 that won't have any noticeable effect.  (It's particularly expensive for
 the earth,  where we do a full-meal-deal precession and nutation matrix.)
-
-   For the earth,  we then rotate the planet to the time jd.  This will be
-needed for handling non-zonal (tesseral) harmonics.  For the other planets,
-we are (at least thus far) just dealing with the zonal terms J2, J3, J4,
-which are spherically symmetrical around the planet's poles;  we just need
-the polar orientation and can ignore rotation.  Though this may not be
-true forever... at some point,  I may want to add tesseral harmonics for,
-say,  the Moon or Mars.  If that happens,  this code will need revising,
-perhaps with a table of omega values. */
+We then rotate the planet from the cached time to the input time jde (again,
+less than half a day).        */
 
 void calc_approx_planet_orientation( const int planet,
          const int system_number, const double jde, double *matrix)
@@ -604,6 +598,7 @@ void calc_approx_planet_orientation( const int planet,
    static int cached_planet = -1;
    const double range = 1.;
    const double new_jde = floor( jde / range + .5) * range;
+   const double omega = planet_rotation_rate( planet, system_number) * PI / 180.;
 
    if( cached_planet != planet || new_jde != cached_jde)
       {
@@ -614,13 +609,7 @@ void calc_approx_planet_orientation( const int planet,
       cached_jde = new_jde;
       }
    memcpy( matrix, cached_matrix, 9 * sizeof( double));
-   if( planet == 3)        /* rotate matrix */
-      {
-      const double omega = 360.9856235 * PI / 180.;
-      const double theta = omega * (jde - cached_jde);
-
-      spin_matrix( matrix, matrix + 3, theta);
-      }
+   spin_matrix( matrix, matrix + 3, omega * (jde - cached_jde));
 }
 
 /* The idea of the following is as follows.  If our distance from the sun
@@ -647,7 +636,7 @@ static ldouble include_thrown_in_planets( const ldouble r)
          if( r > radii[i] * (1. + fraction))
             rval += planet_mass[i];
          else
-            rval += planet_mass[i] * ((1. + fraction) - r / radii[i]) / fraction;
+            rval += planet_mass[i] * (r / radii[i] - 1.) / fraction;
          }
    return( rval);
 }
@@ -740,10 +729,14 @@ static ldouble atmospheric_density( const ldouble ht_in_km)
 }
 
 
-      /* If we're closer than .1 AU,  include Galileans separately: */
+      /* If we're closer than the following distances,  include Galileans */
+      /* or Saturn's satellites or the earth's moon separately,  instead  */
+      /* of just using the system barycenter and its combined mass.  (The */
+      /* earth's moon can be turned on explicitly if so desired.)         */
 
-#define GALILEAN_LIMIT .03
-#define TITAN_LIMIT .03
+#define GALILEAN_LIMIT            .3
+#define SATURN_SATELL_LIMIT       .3
+#define LUNAR_LIMIT               .1
 
 unsigned excluded_perturbers = (unsigned)-1;
 int best_fit_planet;
@@ -810,13 +803,19 @@ static double lagged_dist( const ldouble *state_vect, const ldouble jd,
 {
    double svect[6], outvect[9], rval;
    size_t i;
-   ELEMENTS elem;
 
    for( i = 0; i < 6; i++)
       svect[i] = (double)state_vect[i];
-   find_relative_orbit( (double)jd, svect, &elem, 0);
-   compute_ref_state( &elem, outvect, (double)( jd - lag));
-   rval = vector3_length( outvect);
+   if( !lag)      /* usually the case */
+      rval = vector3_length( svect);
+   else
+      {
+      ELEMENTS elem;
+
+      find_relative_orbit( (double)jd, svect, &elem, 0);
+      compute_ref_state( &elem, outvect, (double)( jd - lag));
+      rval = vector3_length( outvect);
+      }
    return( rval);
 }
 
@@ -827,6 +826,98 @@ static ldouble planet_radius( const int idx)
    return( planet_radius_in_meters( idx) * FUDGE_FACTOR / AU_IN_METERS);
 }
 
+static ldouble solar_multiplier = 1.;
+
+/* If we have constrained an area/mass ratio,  and don't have that as
+a free parameter in the orbit fit,  then the above value will be slightly
+less than 1,  indicating that the object is being slightly pushed away
+from the sun by solar radiation pressure.      */
+
+void compute_effective_solar_multiplier( const char *constraints)
+{
+   extern int force_model;
+   const char *tptr;
+
+   solar_multiplier = 1.;
+   if( constraints)
+      {
+      if( force_model == FORCE_MODEL_NO_NONGRAVS
+               || force_model == FORCE_MODEL_DELTA_V)
+         if( NULL != (tptr = strstr( constraints, "A=")))
+            solar_multiplier = 1. - atof( tptr + 2) * SRP1AU / SOLAR_GM;
+      }
+}
+
+/* We initially compute the barycenters for all planets.  If we
+are close enough to the earth,  Jupiter,  or Saturn,  we may then need
+to instead treat them as separate objects.  This requires shifting
+the barycenter to the planet center location,  and then expressing
+the satellite positions relative to that planet center.
+
+   planet_loc initially contains the system barycentric location,
+sat_locs the (planet-centric) satellite locations.  The first loop
+shifts the planet location from the barycenter to the actual location
+of the planet.  The second loop shifts the satellite locations from
+planet-centric to heliocentric.     */
+
+static void set_satellite_and_planet_locs( const size_t n_sats,
+            double *sat_locs, double *planet_loc, const double *masses,
+            const double system_mass)
+{
+   size_t i, j;
+
+   for( i = 0; i < n_sats; i++)
+      {
+      const double mass_ratio = masses[i] / system_mass;
+
+      for( j = 0; j < 3; j++)
+         planet_loc[j] -= sat_locs[i * 3 + j] * mass_ratio;
+      }
+   for( i = 0; i < n_sats; i++)
+      for( j = 0; j < 3; j++, sat_locs++)
+         *sat_locs += planet_loc[j];
+}
+
+static void get_saturn_sats( const double jd, double *ssat_locs,
+                                    double *saturn_loc)
+{
+   int i;
+
+   for( i = 0; i < 5; i++)
+      calc_ssat_loc( jd, ssat_locs + i * 3,
+                  (i == 4 ? 7 : i + 2), 0L);        /* we skip Hyperion */
+   set_satellite_and_planet_locs( 5, ssat_locs, saturn_loc, planet_mass + 15,
+                  MASS_SATURN_SYSTEM);
+}
+
+static void get_galilean_sats( const double jd, double *jsat_locs,
+                                    double *jupiter_loc)
+{
+   double precess_matrix[10];
+   const double t_years = (jd - J2000) / 365.25;
+   const double obliquity = mean_obliquity( t_years / 100.);
+   size_t i, j;
+
+   setup_precession( precess_matrix, 2000. + t_years, 2000.);
+   calc_jsat_loc( jd, jsat_locs, 15, 0L);
+   assert( PI != jsat_locs[0]);
+   for( i = 0; i < 4; i++)
+      {
+      double tloc[3];
+
+                        /* turn ecliptic of date to equatorial: */
+      rotate_vector( jsat_locs + i * 3, obliquity, 0);
+                        /* then to equatorial J2000: */
+      precess_vector( precess_matrix, jsat_locs + i * 3, tloc);
+                        /* then to ecliptic J2000: */
+      equatorial_to_ecliptic( tloc);
+      for( j = 0; j < 3; j++)       /* then from units of Jupiter radii */
+         jsat_locs[i * 3 + j] = tloc[j] * JUPITER_R;            /* to AU */
+      }
+   set_satellite_and_planet_locs( 4, jsat_locs, jupiter_loc, planet_mass + 11,
+                  MASS_JUPITER_SYSTEM);
+}
+
 int planet_hit = -1;
 
 int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
@@ -836,7 +927,8 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
    ldouble accel_multiplier = 1.;
    int i, j;
    unsigned local_perturbers = perturbers;
-   double lunar_loc[3], jupiter_loc[3], saturn_loc[3];
+   double lunar_loc[3], jsat_loc[12], ssat_loc[15];
+   double reference_planet_posn[3];
    ldouble relativistic_accel[3];
    double fraction_illum = 1., ival_as_double[3];
    extern int force_model;
@@ -848,19 +940,19 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
    assert( fabsl( jd) < 1e+9);
 #if !defined( _WIN32) && !defined( __APPLE__)
    for( i = 0; i < 6; i++)
-      if( isnanl( ival[i]))
+      if( isnan( (double)ival[i]))
          {
          debug_printf( "Bad derivs; jd %Lf; ref %d\n", jd, reference_planet);
          debug_printf( "%Lf %Lf %Lf\n", ival[0], ival[1], ival[2]);
          debug_printf( "%Lf %Lf %Lf\n", ival[3], ival[4], ival[5]);
          assert( 0);
          }
-   assert( !isnanl( ival[0]));
-   assert( !isnanl( ival[1]));
-   assert( !isnanl( ival[2]));
-   assert( !isnanl( ival[3]));
-   assert( !isnanl( ival[4]));
-   assert( !isnanl( ival[5]));
+   assert( !isnan( (double)ival[0]));
+   assert( !isnan( (double)ival[1]));
+   assert( !isnan( (double)ival[2]));
+   assert( !isnan( (double)ival[3]));
+   assert( !isnan( (double)ival[4]));
+   assert( !isnan( (double)ival[5]));
 #endif
    oval[0] = ival[3];
    oval[1] = ival[4];
@@ -896,6 +988,7 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
       }
 
    solar_accel *= -SOLAR_GM / (r2 * r);
+   solar_accel *= solar_multiplier;
 
    if( perturbers)
       set_relativistic_accel( relativistic_accel, ival);
@@ -921,14 +1014,15 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
             oval[i] += asteroid_accel[i];
          }
 
-   if( (n_orbit_params >= 8 && n_orbit_params <= 10) || force_model == FORCE_MODEL_YARKO_A2)
+   if( (n_orbit_params >= 8 && n_orbit_params <= 10 && force_model != FORCE_MODEL_DELTA_V)
+                              || force_model == FORCE_MODEL_YARKO_A2)
       {                  /* Marsden & Sekanina comet formula */
       const ldouble lag = (n_orbit_params == 10 ? ival[9] : 0.);
       const ldouble g = comet_g_func( lagged_dist( ival, jd, lag)) * fraction_illum;
       ldouble transverse[3], dot_prod = 0.;
 
 #if !defined( _WIN32) && !defined( __APPLE__)
-      assert( !isnanl( g));
+      assert( !isnan( (double)g));
 #endif
       memcpy( transverse, ival + 3, 3 * sizeof( ldouble));
       for( i = 0; i < 3; i++)
@@ -953,97 +1047,70 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
             oval[i + 3] += g * ival[8] * out_of_plane[i] / dot_prod;
          }
       }
+   if( reference_planet >= 0)
+      get_planet_posn_vel( jd, reference_planet, reference_planet_posn, NULL);
 
    if( perturbers)
       for( i = 1; i < N_PERTURB + 1; i++)
          if( ((local_perturbers >> i) & 1)
                    && !((excluded_perturbers >> i) & 1))
             {
-            double planet_loc[15], accel[3], mass_to_use = planet_mass[i];
-
-            r = r2 = 0.;
-            if( i >= IDX_IO)       /* Galileans,  Titan */
-               {
-               double matrix[10], sat_loc[15];
-               const double t_years = (jd - J2000) / 365.25;
-
-               if( i >= IDX_TETHYS)         /* Saturnian satell */
-                  calc_ssat_loc( jd, sat_loc,
-                               ((i == IDX_IAPETUS) ? 7 : i - 13), 0L);
-               else
-                  {
-                  calc_jsat_loc( jd, sat_loc, 1 << (i - IDX_IO), 0L);
-                  memmove( sat_loc, sat_loc + (i - IDX_IO) * 3,
-                                                      3 * sizeof( double));
-                  }
-                                 /* turn ecliptic of date to equatorial: */
-               rotate_vector( sat_loc, mean_obliquity( t_years / 100.), 0);
-                                 /* then to equatorial J2000: */
-               setup_precession( matrix, 2000. + t_years, 2000.);
-               precess_vector( matrix, sat_loc, planet_loc + 12);
-                                 /* then to ecliptic J2000: */
-               equatorial_to_ecliptic( planet_loc + 12);
-               for( j = 0; j < 3; j++)
-                  {
-                  double coord;
-
-                  if( i >= IDX_TETHYS)         /* Saturnian */
-                     coord = saturn_loc[j] + planet_loc[12 + j];
-                  else
-                     coord = jupiter_loc[j] + planet_loc[12 + j] * JUPITER_R;
-                  r2 += coord * coord;
-                  planet_loc[12 + j] = coord;
-                  }
-               planet_loc[2] = sqrt( r2);
-               }
+            double planet_loc[3], accel[3], mass_to_use = planet_mass[i];
+            bool position_shifted = false;
+
+            if( i >= IDX_IO && i <= IDX_CALLISTO)  /* Galileans */
+               memcpy( planet_loc, jsat_loc + (i - IDX_IO) * 3, 3 * sizeof( double));
+            else if( i >= IDX_TETHYS && i <= IDX_IAPETUS)
+               memcpy( planet_loc, ssat_loc + (i - IDX_TETHYS) * 3, 3 * sizeof( double));
+            else if( i == IDX_MOON)
+               memcpy( planet_loc, lunar_loc, 3 * sizeof( double));
             else
-               {
-               if( local_perturbers & 1024)   /* if the moon is included */
-                  {
-                  if( i == 3)
-                     earth_lunar_posn( jd, planet_loc, lunar_loc);
-                  else if( i == 10)
-                     memcpy( planet_loc, lunar_loc, 3 * sizeof( double));
-                  else
-                     planet_posn( i, jd, planet_loc);
-                  }
-               else
-                  planet_posn( i, jd, planet_loc);
-
-               for( j = 0; j < 3; j++)
-                  r2 += planet_loc[j] * planet_loc[j];
-               memcpy( planet_loc + 12, planet_loc, 3 * sizeof( double));
-               planet_loc[2] = sqrt( r2);
-               }
+               planet_posn( i, jd, planet_loc);
 
             for( j = 0; j < 3; j++)
-               {
-               accel[j] = ival[j] - planet_loc[12 + j];
-               r += accel[j] * accel[j];
-               }
-            r = sqrt( r);
+               accel[j] = ival[j] - planet_loc[j];
+            r = vector3_length( accel);
 
             if( i == IDX_JUPITER)
                {
                if( r < GALILEAN_LIMIT)
                   {
-                  memcpy( jupiter_loc, planet_loc + 12, 3 * sizeof( double));
                   local_perturbers |= (15 << 11);
+                  get_galilean_sats( jd, jsat_loc, planet_loc);
+                  position_shifted = true;
                   }
                else     /* "throw" Galileans into Jupiter: */
                   mass_to_use = MASS_JUPITER_SYSTEM;
                }
-
-            if( i == IDX_SATURN)
+            else if( i == IDX_SATURN)
                {
-               if( r < TITAN_LIMIT)
+               if( r < SATURN_SATELL_LIMIT)
                   {
-                  memcpy( saturn_loc, planet_loc + 12, 3 * sizeof( double));
                   local_perturbers |= (31 << 15);
+                  get_saturn_sats( jd, ssat_loc, planet_loc);
+                  position_shifted = true;
                   }
                else        /* "throw" saturn's satellites into the primary: */
                   mass_to_use = MASS_SATURN_SYSTEM;
                }
+            else if( i == IDX_EARTH)
+               {
+               if( r < LUNAR_LIMIT || (local_perturbers & 1024))
+                  {
+                  earth_lunar_posn( jd, planet_loc, lunar_loc);
+                  local_perturbers |= 1024;
+                  position_shifted = true;
+                  }
+               else           /* use combined earth/moon barycentre */
+                  mass_to_use = MASS_EARTH + MASS_MOON;
+               }
+
+            if( position_shifted)
+               {
+               for( j = 0; j < 3; j++)
+                  accel[j] = ival[j] - planet_loc[j];
+               r = vector3_length( accel);
+               }
 
             if( r < planet_radius( i))
                {
@@ -1056,8 +1123,8 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
                   return( planet_hit);
                   }
                }
-            if( i >= IDX_EARTH && i <= IDX_NEPTUNE && r < .015 && j2_multiplier)
-               {          /* Within .015 AU,  we take J2 into account: */
+            if( i >= IDX_EARTH && i <= IDX_NEPTUNE && r < .05 && j2_multiplier)
+               {          /* Within .05 AU,  we take J2 into account: */
                double grad[3], delta_j2000[3], matrix[10], delta_planet[3];
                const double j2[6] = { EARTH_J2, MARS_J2, JUPITER_J2,
                         SATURN_J2, URANUS_J2, NEPTUNE_J2 };
@@ -1091,7 +1158,6 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
                if( i == IDX_EARTH && r < ATMOSPHERIC_LIMIT && n_orbit_params == 7
                            && *get_environment_ptr( "DRAG_SHUTOFF") != '1')
                   {
-                  const double SRP1AU = 2.3e-7;   /* kg*AU^3 / (m^2*d^2) */
                   const double amr_drag = ival[6] * SOLAR_GM / SRP1AU;
                   const double rho_cos_phi =
                           hypot( delta_planet[0], delta_planet[1]) / EARTH_RADIUS_IN_AU;
@@ -1124,7 +1190,7 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
                   equatorial_to_ecliptic( vel);
                   for( j = 0; j < 3; j++)
                      {
-                     const double earth_vel = (earth_loc[j] - planet_loc[j + 12]) / dt;
+                     const double earth_vel = (earth_loc[j] - planet_loc[j]) / dt;
 
                      vel[j] += earth_vel - oval[j];       /* in AU/day */
                      vel[j] *= AU_IN_METERS / seconds_per_day;  /* cvt to m/s */
@@ -1161,31 +1227,24 @@ int calc_derivativesl( const ldouble jd, const ldouble *ival, ldouble *oval,
                for( j = 0; j < 3; j++)
                   oval[j + 3] += accel_factor * accel[j];
                }
-            if( i != reference_planet)
+            if( i != reference_planet || (position_shifted && i >= 5))
                {
                if( reference_planet >= 0)
-                  {
-                  double planet_posn[3];
-
-                  get_planet_posn_vel( jd, reference_planet, planet_posn, NULL);
                   for( j = 0; j < 3; j++)
-                     planet_loc[j + 12] -= planet_posn[j];
-                  r = vector3_length( planet_loc + 12);
-                  }
-               else
-                  r = planet_loc[2];
-               if( r)
-                   r = -SOLAR_GM * mass_to_use / (r * r * r);
+                     planet_loc[j] -= reference_planet_posn[j];
+               r = vector3_length( planet_loc);
+               assert( r);
+               r = -SOLAR_GM * mass_to_use / (r * r * r);
                for( j = 0; j < 3; j++)
-                  oval[j + 3] += r * planet_loc[j + 12];
+                  oval[j + 3] += r * planet_loc[j];
                }
             else        /* subtract sun's attraction to reference planet */
                {
-               r = planet_loc[2];
-               if( r)
-                   r = SOLAR_GM / (r * r * r);
+               r = vector3_length( planet_loc);
+               assert( r);
+               r = SOLAR_GM / (r * r * r);
                for( j = 0; j < 3; j++)
-                  oval[j + 3] += r * planet_loc[j + 12];
+                  oval[j + 3] += r * planet_loc[j];
                }
             }
    if( planet_hit != -1)
@@ -1202,6 +1261,7 @@ int calc_derivatives( const double jd, const double *ival, double *oval,
    ldouble ival1[MAX_N_PARAMS], oval1[MAX_N_PARAMS];
 
    assert( fabs( (double)jd) < 1e+9);
+   assert( n_orbit_params >= 6);
    for( i = 0; i < (size_t)n_orbit_params; i++)
       ival1[i] = (ldouble)ival[i];
    rval = calc_derivativesl( (ldouble)jd, ival1, oval1, reference_planet);
@@ -1210,36 +1270,39 @@ int calc_derivatives( const double jd, const double *ival, double *oval,
    return( rval);
 }
 
+int earth_lunar_vel( const double jd, double FAR *earth_loc, double FAR *lunar_loc);
+
 int get_planet_posn_vel( const double jd, const int planet_no,
                      double *posn, double *vel)
 {
    assert( fabs( jd) < 1e+9);
-   if( posn)
+   if( !planet_no)
       {
-      if( !planet_no)       /* sun doesn't move in the heliocentric frame */
+      if( posn)       /* sun doesn't move in the heliocentric frame */
          memset( posn, 0, 3 * sizeof( double));
-      else if( planet_no == 3)
+      if( vel)
+         memset( vel, 0, 3 * sizeof( double));
+      }
+   else if( planet_no == 3)
+      {
+      if( posn)
          earth_lunar_posn( jd, posn, NULL);
-      else if( planet_no == 10)
+      if( vel)
+         earth_lunar_vel( jd, vel, NULL);
+      }
+   else if( planet_no == 10)
+      {
+      if( posn)
          earth_lunar_posn( jd, NULL, posn);
-      else
-         planet_posn( planet_no, jd, posn);
+      if( vel)
+         earth_lunar_vel( jd, NULL, vel);
       }
-   if( vel)
+   else
       {
-      if( !planet_no)       /* sun doesn't move in the heliocentric frame */
-         memset( vel, 0, 3 * sizeof( double));
-      else
-         {
-         int i;
-         double loc1[3], loc2[3];
-         const double delta = 1. / minutes_per_day;    /* one minute delta... */
-
-         get_planet_posn_vel( jd + delta, planet_no, loc2, NULL);
-         get_planet_posn_vel( jd - delta, planet_no, loc1, NULL);
-         for( i = 0; i < 3; i++)
-            vel[i] = (loc2[i] - loc1[i]) / (2. * delta);
-         }
+      if( posn)
+         planet_posn( planet_no, jd, posn);
+      if( vel)
+         planet_posn( planet_no + PLANET_POSN_VELOCITY_OFFSET, jd, vel);
       }
    return( 0);
 }
@@ -1742,32 +1805,23 @@ ldouble take_rk_stepl( const ldouble jd, ELEMENTS *ref_orbit,
    return( sqrtl( rval * step * step));
 }
 
-int symplectic_6( double jd, ELEMENTS *ref_orbit, double *vect,
-                                          const double dt)
+#define W1  -1.17767998417887
+#define W2  0.235573213359357
+#define W3  0.784513610477560
+#define W0  (1-2*(W1+W2+W3))
+
+int symplectic_6( ldouble jd, ELEMENTS *ref_orbit, ldouble *vect,
+                                          const ldouble dt)
 {
    int i, j;
-#ifdef FOR_REFERENCE_ONLY
-         /* Some compilers object to mathematically defined consts,  so  */
-         /* I had to replace these lines with explicit numerical consts: */
-   const double w1 = -0.117767998417887E1;
-   const double w2 = 0.235573213359357E0;
-   const double w3 = 0.784513610477560E0;
-   const double w0 = (1-2*(w1+w2+w3));
-   const double d6[7] = { w3, w2, w1, w0, w1, w2, w3 };
-   const double c6[8] = { w3/2, (w3+w2)/2, (w2+w1)/2, (w1+w0)/2,
-                         (w1+w0)/2, (w2+w1)/2, (w3+w2)/2, w3/2 };
-#endif
-   static const double d6[7] = { 0.7845136104775600,  0.2355732133593570,
-            -1.1776799841788700, 1.3151863206839060, -1.1776799841788700,
-             0.2355732133593570, 0.7845136104775600 };
-   static const double c6[8] = { 0.3922568052387800,  0.5100434119184585,
-            -0.4710533854097566, 0.0687531682525180,  0.0687531682525180,
-            -0.4710533854097566, 0.5100434119184585,  0.3922568052387800 };
+   const ldouble d6[7] = { W3, W2, W1, W0, W1, W2, W3 };
+   const ldouble c6[8] = { W3/2, (W3+W2)/2, (W2+W1)/2, (W1+W0)/2,
+                         (W1+W0)/2, (W2+W1)/2, (W3+W2)/2, W3/2 };
 
    for( i = 0; i < 8; i++)
       {
-      double deriv[6];
-      const double step = dt * c6[i];
+      ldouble deriv[6];
+      const ldouble step = dt * c6[i];
 
       for( j = 0; j < 3; j++)
          vect[j] += step * vect[j + 3];
@@ -1775,11 +1829,12 @@ int symplectic_6( double jd, ELEMENTS *ref_orbit, double *vect,
       if( i != 7)
          {
          assert( fabs( jd) < 1e+9);
-         calc_derivatives( jd, vect, deriv, ref_orbit->central_obj);
+         for( j = 3; j < 6; j++)
+            deriv[j] = 0.;
+         calc_derivativesl( jd, vect, deriv, ref_orbit->central_obj);
          for( j = 3; j < 6; j++)
             vect[j] += dt * d6[i] * deriv[j];
          }
       }
    return( 0);
 }
-
diff --git a/scopes.txt b/scopes.txt
index 1004dc1b..54f5088f 100644
--- a/scopes.txt
+++ b/scopes.txt
@@ -1140,7 +1140,15 @@ TEL 10-m Keck I reflector
 COD Ke2
 TEL 10-m Keck II reflector
 
-# Following are some scopes collected at random from MPECs.
+# Following are some scopes collected at random from MPECs or elsewhere.
+
+# Magellan - Clay
+COD 268
+TEL 6.5-m f/11 reflector + CCD
+
+# Magellan - Baade
+COD 269
+TEL 6.5-m f/11 reflector + CCD
 
  COD 688
  TEL 4-m Discovery Channel Telescope
@@ -1148,6 +1156,9 @@ TEL 10-m Keck II reflector
 COD G83
 TEL 8.4-m reflector + CCD
 
+COD T11
+TEL 3.8-m Cassegrain reflector
+
 COD Q62
 TEL 0.50-m f/6.8 astrograph + CCD + focal reducer, 0.70-m f/6.6 astrograph + CCD
 
diff --git a/shadow.cpp b/shadow.cpp
index 2aa69ba3..9442ba15 100644
--- a/shadow.cpp
+++ b/shadow.cpp
@@ -23,6 +23,13 @@ that ring and the fraction of that ring which is uneclipsed.  Summing
 up those ring contributions gets you a value between 0% (total eclipse)
 and 100% (no eclipse).
 
+   It seems to me that for computing solar radiation pressure,  we would
+want "the limb darkening for total energy radiated by that part of the
+sun".  For computing the effect on apparent magnitude,  we would want
+to know "the limb darkening for V magnitude for that part of the sun".
+I haven't seen that distinction drawn anywhere,  but would expect it to
+make a small difference.
+
    A formula on page 216 of
 https://ui.adsabs.harvard.edu/abs/2018MPBu...45..215B/abstract gives
 a decent approximation of disk brightness as a function of radius,
@@ -32,10 +39,10 @@ I = 0.436 + 0.72 * mu - 0.16 mu^2
 
    where I = intensity and mu^2 = 1 - (r/R)^2,  r = distance from
 the center of the solar disk and R = radius of the solar disk.  It
-refers to a no-longer-available source,
+refers to :
 
 Youles, S. (2017). "PH3010: Solar Limb Darkening."
-https://twiki.ph.rhul.ac.uk/twiki/pub/Public/SamYoules/PH3010_Solar_limb_darkening.pdf
+https://twiki.ph.rhul.ac.uk/twiki/pub/Public/Solar_Limb_Darkening_Project/Solar_Limb_Darkening.pdf
 
    Two similar polynomials that include terms to mu^5 are given in
 
@@ -49,7 +56,8 @@ Youles, S. (2017). "PH3010: Solar Limb Darkening."
     While the coefficients of the two quintics are very different,  they
 give similar results until you get close to the edge,  and even there,
 the maximum difference is about 0.02.  Comparing intensities as a function
-of radius,  with the intensity at the center being 1,  gets you this :
+of radius gets you this.  Note that they're normalized to have intensity=1
+at the center (with some roundoff occurring).
 
  r/R  Youles  PS1977  NL1994
 0.00: 0.99600 1.00001 1.00000
@@ -96,98 +104,123 @@ dmu/dr = -r/mu,  dr = -(mu/r) dmu,  and we can change variables :
 
              1
             (
-TI(r0) = 2pi \  (a0 * mu + a1 * mu2 + a2 * mu^3 + ...) dmu
+TI(r0) = 2pi \  (a0 * mu + a1 * mu^2 + a2 * mu^3 + ...) dmu
               )
             mu=mu0
 
    which is trivially integrable analytically.  In the following function,
 the 2pi factor is ignored;  all we really care about is the fractional
-intensity (0 if no disk visible,  1 if r=R.  I0 = TI(1) / 2pi.)     */
+intensity (0 if no disk visible,  1 if r=R : the 'normalized' intensity
+I(r) = TI(r) / TI(r0).)
+
+   Compiles with
+
+g++ -Wall -Wextra -Wshadow -pedantic -oshadow shadow.cpp       */
 
 #include <math.h>
 
-#define NECKEL_LABS_COEFFS
-/* #define YOULES_COEFFS   */
+#define YOULES                      0
+#define PIERCE_SLAUGHTER            1
+#define NECKEL_LABS                 2
+#define UNIFORM_DISK                3
+
+static const double pierce_slaughter_coeffs[6] = {
+            0.30505, 1.13123, -0.78604, 0.40560,  0.02297, -0.07880 };
+static const double neckel_labs_coeffs[6] = {
+            0.28392, 1.36896, -1.75998, 2.22154, -1.56074, 0.44630 };
+static const double youles_coeffs[6] = {
+            0.436, 0.72, -0.16, 0., 0., 0.};
+static const double *coeffs[4] = { youles_coeffs,
+          pierce_slaughter_coeffs, neckel_labs_coeffs };
+
+static double intensity( const double r, const int method)
+{
+   const double mu2 = 1. - r * r;
+   double mu, rval = 0, power = 1.;
+   size_t i;
+
+   if( mu2 > 0.)        /* with roundoff,  we can be slightly negative */
+      mu = sqrt( mu2);
+   else
+      mu = 0.;
+   for( i = 0; i < 6; i++, power *= mu)
+      rval += coeffs[method][i] * power;
+   return( rval);
+}
+
+#include <stdio.h>
+
+#ifdef OLD_TEST_CODE
 
-static double total_intensity( const double r)
+static double total_intensity( const double r, const int method)
 {
-#ifdef PIERCE_SLAUGHTER_COEFFS
-   const double I0 = 0.4067828571428571;   /* above integral for r=0, mu=1 */
-#endif
-#ifdef NECKEL_LABS_COEFFS
-   const double I0 = 0.4062268095238096;   /* above integral for r=0, mu=1 */
-#endif
-#ifdef YOULES_COEFFS
-   const double I0 = 0.418;                /* above integral for r=0, mu=1 */
-#endif
    const double mu2 = 1. - r * r;
    double mu, rval = 0, power = mu2;
    size_t i;
-#ifdef PIERCE_SLAUGHTER_COEFFS
-   static const double coeffs[6] = { 0.30505, 1.13123, -0.78604,
-                                    0.40560,  0.02297, -0.07880 };
-#endif
-#ifdef NECKEL_LABS_COEFFS
-   static const double coeffs[6] = { 0.28392, 1.36896, -1.75998,
-                                    2.22154, -1.56074, 0.44630 };
-#endif
-#ifdef YOULES_COEFFS
-   static const double coeffs[3] = { 0.436,   0.72,    -0.16 };
-#endif
+   static double i0;
+   static int curr_method = -1;
 
+   if( method == UNIFORM_DISK)
+      return( r * r);
+   if( method != curr_method)    /* recalculate i0 */
+      {
+      i0 = 0.;
+      curr_method = method;
+      for( i = 0; i < 6; i++)
+         i0 += coeffs[method][i] / (double)( i + 2);
+      }
    if( mu2 > 0.)        /* with roundoff,  we can be slightly negative */
       mu = sqrt( mu2);
    else
       mu = 0.;
-   for( i = 0; i < sizeof( coeffs) / sizeof( coeffs[0]); i++, power *= mu)
-      rval += coeffs[i] * power / (double)( i + 2);
-/* return( r * r);                  for a uniformly intense solar disc */
-   return( (I0 - rval) / I0);
+   for( i = 0; i < 6; i++, power *= mu)
+      rval += coeffs[method][i] * power / (double)( i + 2);
+   return( (i0 - rval) / i0);
 }
 
-#include <stdio.h>
+      /* I used this to verify that the numerical derivative of the
+      'total_intensity()' function matches,  after normalization,
+      the results from the 'intensity()' function.  Shouldn't have
+      to do that,  but I didn't entirely trust myself on the above
+      derivation... */
 
 int main( const int argc, const char **argv)
 {
    double r;
+   const int method = (argc < 2 ? PIERCE_SLAUGHTER : atoi( argv[1]));
 
-   printf( "I0 = %.16f\n", total_intensity( 0));
+   printf( "I0 = %.16f\n", total_intensity( 0, method));
    for( r = 0.; r < 1.005; r += (r < 0.94 ? 0.05 : 0.01))
       {
       const double h = 0.001;
       double numeric_deriv =
-               (total_intensity( r + h) - total_intensity( r - h)) / (2. * h);
+               (total_intensity( r + h, method) - total_intensity( r - h, method)) / (2. * h);
 
       if( r)
          numeric_deriv /= r;
-      printf( "%.2f: %.9f %.5f\n", r, total_intensity( r), numeric_deriv);
+      printf( "%.2f: %.9f %.9f %.5f\n", r, intensity( r, method),
+                              total_intensity( r, method), numeric_deriv);
       }
    return( 0);
 }
 
-#ifdef OLD_CODE_USED_FOR_TABLE
+#else         /* #ifdef OLD_TEST_CODE */
 
-/* I used this to make the table in the comments at top. */
+/* Default : generate table in the comments at top. */
 
-int main( const int argc, const char **argv)
+int main( void)
 {
    double r;
+   int method;
 
    printf( " r/R  Youles  PS1977  NL1994\n");
    for( r = 0.; r < 1.005; r += (r < 0.94 ? 0.05 : 0.01))
       {
-      double mu2 = 1. - r * r;
-      double mu, youles, ps, nl;
-
-      if( mu2 > 0.)
-         mu = sqrt( 1. - r * r);
-      else
-         mu = 0.;
-      youles = 0.436 + mu * (0.72 - 0.16 * mu);
-      ps = 0.30505 + mu * (1.13123 + mu * (-0.78604 + mu * (0.40560 + mu * ( 0.02297 + mu * -0.07880))));
-      nl = 0.28392 + mu * (1.36896 + mu * (-1.75998 + mu * (2.22154 + mu * (-1.56074 + mu *  0.44630))));
-      printf( "%.2f: %.5f %.5f %.5f\n", r, youles, ps, nl);
+      printf( "%.2f:", r);
+      for( method = 0; method < 3; method++)
+         printf( " %.5f", intensity( r, method));
+      printf( "\n");
       }
    return( 0);
 }
-#endif         /* #ifdef OLD_CODE_NOT_IN_USE */
+#endif
diff --git a/shellsor.cpp b/shellsor.cpp
index d8ee74de..3f017297 100644
--- a/shellsor.cpp
+++ b/shellsor.cpp
@@ -104,6 +104,12 @@ void shellsort_r( void *base, const size_t n_elements, const size_t elem_size,
          int (*compare)(const void *, const void *, void *), void *context);
 void shellsort( void *base, const size_t n_elements, const size_t elem_size,
          int (*compare)(const void *, const void *));    /* shellsor.cpp */
+void *bsearch_ext_r( const void *key, const void *base0, size_t nmemb,
+      const size_t size, int (*compar)(const void *, const void *, void *),
+      void *arg, bool *found);                           /* shellsor.cpp */
+void *bsearch_ext( const void *key, const void *base0,
+      size_t nmemb, const size_t size,                   /* shellsor.cpp */
+      int (*compar)(const void *, const void *), bool *found);
 
 void shellsort_r( void *base, const size_t n_elements, const size_t elem_size,
          int (*compare)(const void *, const void *, void *), void *context)
@@ -152,21 +158,91 @@ void shellsort_r( void *base, const size_t n_elements, const size_t elem_size,
 
 #ifdef NOT_CURRENTLY_USED
 /*  https://sourceware.org/ml/libc-alpha/2008-12/msg00007.html mentions
-that, with the arguments given in the order used in glibc,  a non-recursive
-sort can be (and,  in glibc,  is) implemented just by using the recursive
-version.  The last "context" parameter is simply ignored on all
-architectures of which the author was aware.
-
-   It seems like an excellent idea.  But it's a weird cast that produces a
-warning in GCC 8,  and I'm not actually calling the non-recursive sort
-anyway;  it's completely untested.  Hence the above #ifdef to remove both
-usused code and the warning. If I someday decide I need a non-recursive
-sort,  I'll deal with it all then. */
+that, with the arguments given in the order used in glibc,  a non-re-entrant
+sort can be (and,  in glibc,  is) implemented simply by using the re-entrant
+version,  passing a NULL context pointer.  On all architectures of which the
+author was aware,  this can be done safely,  with the unused/unset NULL
+context pointer never getting used.
+
+   It seems like an excellent idea.  The weird cast is essentially the one
+used for bsearch_ext() (see below),  and I am reasonably confident the
+following would work.  However,  I've not needed it yet and it is therefore
+untested and #ifdeffed out.  If I someday decide I need a non-re-entrant
+sort,  I'll test it then. */
 
 void shellsort( void *base, const size_t n_elements, const size_t elem_size,
          int (*compare)(const void *, const void *))
 {
+   void (*p)() = (void (*)())compare;
+
    shellsort_r( base, n_elements, elem_size,
-               (int (*)(const void *, const void *, void *))compare, NULL);
+               (int (*)( const void *, const void *, void *))p, NULL);
 }
 #endif
+
+/* bsearch() doesn't take a 'context' pointer,  and therefore can't use
+the above sort of re-entrant comparison function.  'bsearch_r()' is
+available on some more modern GCCs (but not older ones and not on
+Microsoft C/C++.)  Code for bsearch_r() is at
+
+https://gnu.googlesource.com/gcc/+/refs/heads/master/libiberty/bsearch_r.c
+
+   The following is based loosely on that code,  and 'extended' (hence the
+_ext in the name) in two ways :
+
+   -- It returns the first matching record.  (The original would return
+_a_ matching record,  not necessarily the first.)
+
+   -- If the additional parameter 'found' is non-NULL,  then the return
+value indicates the location of the first record matching the key if such
+a record exists, and *found is set to true.  If no matching record is
+found,  then the return value indicates the slot where the record would
+be inserted, and *found is set to false.  This allows one to find
+"nearby" records and/or to know there a new key would be inserted.
+
+   If 'found' is NULL,  the return value points to the first matching
+record,  or NULL if no match is found.       */
+
+void *bsearch_ext_r( const void *key, const void *base0, size_t nmemb,
+      const size_t size, int (*compar)(const void *, const void *, void *),
+      void *arg, bool *found)
+{
+   const char *base = (const char *) base0;
+   bool found_it = false;
+
+   while( nmemb)
+      {
+      const void *p = base + (nmemb >> 1) * size;
+      const int cmp = (*compar)(key, p, arg);
+
+      if( !cmp)
+         found_it = true;
+      if (cmp > 0)  /* key > p: move right */
+         {
+         base = (const char *)p + size;
+         nmemb--;
+         } /* else move left */
+      nmemb >>= 1;
+      }
+   if( !found && !found_it)
+      base = NULL;
+   else if( found)
+      *found = found_it;
+   return( (void *)base);
+}
+
+/* See comments above on shellsort() : because the context pointer is
+the last argument,  we can omit it safely and use just the above
+function both for contextual and non-contextual comparison functions.
+Note that an ugly and nominally dangerous cast is required.   */
+
+void *bsearch_ext( const void *key, const void *base0,
+      size_t nmemb, const size_t size,
+      int (*compar)(const void *, const void *), bool *found)
+{
+   void (*p)() = (void (*)())compar;
+
+   return( bsearch_ext_r( key, base0, nmemb, size,
+               (int (*)( const void *, const void *, void *))p,
+               NULL, found));
+}
diff --git a/sigma.cpp b/sigma.cpp
index 302d788e..1d471b1d 100644
--- a/sigma.cpp
+++ b/sigma.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
+#include "assert2.h"
 #include <math.h>
 #include "watdefs.h"
 #include "sigma.h"
diff --git a/sigma.txt b/sigma.txt
index d5a81a61..43411d3d 100644
--- a/sigma.txt
+++ b/sigma.txt
@@ -63,7 +63,6 @@
 #Obs P  <--start-> <--end -->           Pos   Mag  Time
 #COD C  yyyy mm dd yyyy mm dd mag1 mag2 sig   sig  sig    Comment
  689                                    .1                Flagstaff
- 673                                    .1                Table Mountain
  422                                    .3                Loomberah
  413    1993 01 01                      .3                Siding Spring
  E12                                    .25               Siding Spring #2
@@ -83,92 +82,60 @@
 # is probably quite a bit better than the above .1 second.
 #
 #    SOHO and STEREO,  though,  were not intended to do astrometry and
-# produce noisy data.  "Program code" A = SOHO C2; B = SOHO C3;
-# G = STEREO/SECCHI HI1-A; H = COR2-A (both for code C49);  and
-# O = STEREO/SECCHI HI1-B; H = COR2-B (both for code C50).  SOHO
-# uncertainties as a function of magnitude and camera are from
-# an e-mail from Karl Battams,  2019 Nov 1.
+# produce noisy data.  "Program codes" A and 2 = SOHO C2; B and 3=
+# SOHO C3.
+#    For SOHO,  we check for "program codes" A or 2,  meaning C2
+# was used.  Everything else from (249) is assumed to use the
+# lower-accuracy C3.  (People sometimes mangle the codes;  we
+# want to default to the lower accuracy in such cases.)
  249 A                         8.7      36                SOHO
- 249 A                         8.2  8.8 24                SOHO
- 249 A                         7.2  8.2 12                SOHO
- 249 A                         4.2  7.2  6                SOHO
- 249 A                         2.7  4.2 12                SOHO
- 249 A                         1.7  2.7 18                SOHO
- 249 A                         0.2  1.7 24                SOHO
- 249 A                        -1.8  0.2 36                SOHO
- 249 A                             -1.8 48                SOHO
- 249 B                         9.7      280               SOHO
- 249 B                         9.2  9.7 224               SOHO
- 249 B                         7.7  9.2 168               SOHO
- 249 B                         7.2  7.7 112               SOHO
- 249 B                         6.7  7.2 84                SOHO
- 249 B                         5.7  6.7 56                SOHO
- 249 B                         2.7  5.7 28                SOHO
- 249 B                         1.2  2.7 56                SOHO
- 249 B                        -0.2  1.2 84                SOHO
- 249 B                        -1.2 -0.2 112               SOHO
- 249 B                             -1.2 168               SOHO
-
-# Older SOHO astrometry uses "program code" 2 for SOHO C2 (instead
-# of the A used more recently) and 3 for SOHO C3 (instead of B).  Makes
-# sense to me;  dunno why they changed... it does mean the above
-# SOHO uncertainties have to be duplicated redundantly.
  249 2                         8.7      36                SOHO
+ 249 A                         8.2  8.8 24                SOHO
  249 2                         8.2  8.8 24                SOHO
+ 249 A                         7.2  8.2 12                SOHO
  249 2                         7.2  8.2 12                SOHO
+ 249 A                         4.2  7.2  6                SOHO
  249 2                         4.2  7.2  6                SOHO
+ 249 A                         2.7  4.2 12                SOHO
  249 2                         2.7  4.2 12                SOHO
+ 249 A                         1.7  2.7 18                SOHO
  249 2                         1.7  2.7 18                SOHO
+ 249 A                         0.2  1.7 24                SOHO
  249 2                         0.2  1.7 24                SOHO
+ 249 A                        -1.8  0.2 36                SOHO
  249 2                        -1.8  0.2 36                SOHO
+ 249 A                             -1.8 48                SOHO
  249 2                             -1.8 48                SOHO
- 249 3                         9.7      280               SOHO
- 249 3                         9.2  9.7 224               SOHO
- 249 3                         7.7  9.2 168               SOHO
- 249 3                         7.2  7.7 112               SOHO
- 249 3                         6.7  7.2 84                SOHO
- 249 3                         5.7  6.7 56                SOHO
- 249 3                         2.7  5.7 28                SOHO
- 249 3                         1.2  2.7 56                SOHO
- 249 3                        -0.2  1.2 84                SOHO
- 249 3                        -1.2 -0.2 112               SOHO
- 249 3                             -1.2 168               SOHO
+ 249                           9.7      280               SOHO
+ 249                           9.2  9.7 224               SOHO
+ 249                           7.7  9.2 168               SOHO
+ 249                           7.2  7.7 112               SOHO
+ 249                           6.7  7.2 84                SOHO
+ 249                           5.7  6.7 56                SOHO
+ 249                           2.7  5.7 28                SOHO
+ 249                           1.2  2.7 56                SOHO
+ 249                          -0.2  1.2 84                SOHO
+ 249                          -1.2 -0.2 112               SOHO
+ 249                               -1.2 168               SOHO
+
 # Karl also guesstimates sigmas for HI-1 to be pretty bad,  maybe
 # two 70" pixels.  COR-2 is much better by comparison,  10".
- C49 G                                  140               STEREO-A
+# G or 4 = STEREO/SECCHI HI1-A; H or 5 = COR2-A (for code C49);
+# O or 4 = STEREO/SECCHI HI1-B; P or 5 = COR2-B (for code C50).
+# These are also from an e-mail from Karl Battams,  2019 Nov 1.
  C49 H                                  10                STEREO-A
- C50 O                                  140               STEREO-B
- C50 P                                  10                STEREO-B
-# Repetition of above (249) SOHO and (C49), (C50) STEREO-A, B records.
-# Pre-2013 observations used 2 and 3 instead of A and B (SOHO) and
-# 4, 5 instead of G, H and O, P (STEREO).
- 249 2                         8.7      36                SOHO
- 249 2                         8.2  8.8 24                SOHO
- 249 2                         7.2  8.2 12                SOHO
- 249 2                         4.2  7.2  6                SOHO
- 249 2                         2.7  4.2 12                SOHO
- 249 2                         1.7  2.7 18                SOHO
- 249 2                         0.2  1.7 24                SOHO
- 249 2                        -1.8  0.2 36                SOHO
- 249 2                             -1.8 48                SOHO
- 249 3                         9.7      280               SOHO
- 249 3                         9.2  9.7 224               SOHO
- 249 3                         7.7  9.2 168               SOHO
- 249 3                         7.2  7.7 112               SOHO
- 249 3                         6.7  7.2 84                SOHO
- 249 3                         5.7  6.7 56                SOHO
- 249 3                         2.7  5.7 28                SOHO
- 249 3                         1.2  2.7 56                SOHO
- 249 3                        -0.2  1.2 84                SOHO
- 249 3                        -1.2 -0.2 112               SOHO
- 249 3                             -1.2 168               SOHO
- C49 4                                  140               STEREO-A
- C49 4                                  10                STEREO-A
- C50 4                                  140               STEREO-B
+ C49 5                                  10                STEREO-A
+ C49                                    140               STEREO-A
+ C50 P                                  10                STEREO-A
  C50 5                                  10                STEREO-B
+ C50                                    140               STEREO-B
 # Still puzzling out how Solar Orbiter astrometry should be handled.
 # Based on exactly one object,  let's say 20".
  SoO                                    20                Solar Orbiter
+# Similar uncertainty about Parker Space Probe.  We think it depends
+# a lot on where you are in the FOV.  But (again based on one object),
+# let's say 30".
+ PSP                                    30                Parker Space Probe
 # TESS data has (I assume) beautiful photometry,  but the astrometry
 # appears to be approximate at best.
  C57                                     5                TESS
@@ -207,6 +174,37 @@
 # the 80-column astrometric format won't give us all of that.)
 # I assume accuracy in time to a video frame = 1/60 second.
  244                                    .001       .017   Geocentric occultation
+# Unistellar telescopes have quite iffy astrometry.  The first
+# such observer will have obscode (270);  additional ones will
+# be assigned obscodes (27a),  (27b), ... just to keep them
+# reasonably straight.
+ 270                                    10         1.0    Unistellar Network
+ 27a                                    10         1.0    Unistellar Network
+ 27b                                    10         1.0    Unistellar Network
+ 27c                                    10         1.0    Unistellar Network
+ 27d                                    10         1.0    Unistellar Network
+ 27e                                    10         1.0    Unistellar Network
+ 27f                                    10         1.0    Unistellar Network
+ 27g                                    10         1.0    Unistellar Network
+ 27h                                    10         1.0    Unistellar Network
+ 27i                                    10         1.0    Unistellar Network
+ 27j                                    10         1.0    Unistellar Network
+ 27k                                    10         1.0    Unistellar Network
+ 27l                                    10         1.0    Unistellar Network
+ 27m                                    10         1.0    Unistellar Network
+ 27n                                    10         1.0    Unistellar Network
+ 27o                                    10         1.0    Unistellar Network
+ 27p                                    10         1.0    Unistellar Network
+ 27q                                    10         1.0    Unistellar Network
+ 27r                                    10         1.0    Unistellar Network
+ 27s                                    10         1.0    Unistellar Network
+ 27t                                    10         1.0    Unistellar Network
+ 27u                                    10         1.0    Unistellar Network
+ 27v                                    10         1.0    Unistellar Network
+ 27w                                    10         1.0    Unistellar Network
+ 27x                                    10         1.0    Unistellar Network
+ 27y                                    10         1.0    Unistellar Network
+ 27z                                    10         1.0    Unistellar Network
 #  You MUST have some final "catchall" lines that assign sigmas to all
 # observations not otherwise catalogued.  Here,  we'll say that if the
 # observation predates 1993,  we'll assume a sigma of 3",  no matter
diff --git a/sm_vsop.cpp b/sm_vsop.cpp
index 630c1f3a..3f653f8f 100644
--- a/sm_vsop.cpp
+++ b/sm_vsop.cpp
@@ -22,9 +22,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #include "watdefs.h"
 #include "afuncs.h"     /* for vector3_length() proto */
 
-/* Following are the first few terms of the VSOP87 Cartesian coordinate
+/* Following are the first few terms of the VSOP87A Cartesian coordinate
    series for each planet (Mercury through Neptune;  VSOP doesn't do
-   Pluto).  The 'axis' is 1 for x, 2 for y, 3 for z.
+   Pluto).  Data can be found at https://cdsarc.cds.unistra.fr/viz-bin/cat/VI/81.
+
+Planetary Theories in rectangular and spherical variables: VSOP87 solution.
+     Bretagnon P., Francou G.
+    <Astron. Astrophys. 202, 309 (1988)> =1988A&A...202..309B
+
+Theorie du mouvement de l'ensemble des planetes (VSOP82).
+     Bretagnon P.
+    <Astron. Astrophys. 114, 278 (1982)> =1982A&A...114..278B
+
+   The 'axis' is 1 for x, 2 for y, 3 for z.
 
    The position is computed as the sum of terms of the form
 
diff --git a/splash.txt b/splash.txt
index 9d485bbd..e21f7298 100644
--- a/splash.txt
+++ b/splash.txt
@@ -1,48 +1,259 @@
-21 75
-______________________
-\                     \
- \     ____________    \
-  |    |           \    \
-  |    |            \    \
-  |    |             \    \
-  |    |              )    )  Project Pluto
-  |    |             /    /   Software for the discriminating astronomer
-  |    |            /    /
-  |    |___________/    /     Find_Orb orbit determination software
-  |                    /      Version $v
-  |     ______________/       https://www.projectpluto.com/find_orb.htm
-  |    |
-  |    |
-  |    |
-  |    |
-  |    |
-  |    |                 /|
-  |    |________________/ |
- /                        |
-/_________________________|
-14 62
-______________
-\             \
- |  +-------\  \
- |  |        \  \
- |  |         )  )  Project Pluto
- |  |        /  /   Software for the discriminating astronomer
- |  +-------/  /
- |  __________/     Find_Orb orbit determination software
- |  |               Version $v
- |  |               https://www.projectpluto.com/find_orb.htm
- |  |
- |  |          /|
- |  +---------/ |
-/_______________|
+Splash screen data for interactive Find_Orb.  The splash screen can
+be seen at any time by hitting '.'.
+
+Find_Orb will search through this file for pairs of numbers giving
+a line/column size.  If it'll fit the current screen,  that number of
+lines is read and displayed.  Otherwise,  it keeps going until it
+finds a pair that will fit (thus,  these go in order of descending size).
+A few variables are provided to be filled in with Find_Orb version info,
+EOP (Earth Orientation Parameters) data,  JPL DE info,  &c.
+
+Lines not starting with two numbers (such as this and the above) are
+treated as comments.
+
+35 111
+  ________________________________
+ /\                               \         ___  ___    __    ___ ____   __  _____    ___  _   .   . _____  __
+/  \                               \        |  \ |  \  /  \     | |     /  \   |      |  \ |   |   |   |   /  \
+\   \                               \       |__/ |__/ /    \    | |__  /       |      |__/ |   |   |   |  /    \
+ \   \      ___________________      \      |    |  \ \    /    | |    \       |      |    |   |   |   |  \    /
+  |   |     |                  \      \     |    |   \ \__/  \__| |___  \__/   |      |    |__  \_/    |   \__/
+  |   |     |________________   \      \
+  |   |     |                \   \      \     _______  __  ___     __  _____           ___     _____    _____
+  |   |     |                 \   \      \    | _____| | | |  \    | | |  _ \         / _ \    |  _ \   |  _ \
+  |   |     |                  \   \      \   | |      | | |   \   | | | | \ \       / / \ \   | | \ \  | | \ \
+  |   |     |                   \   )      )  | |___   | | | |\ \  | | | |  \ \     / /   \ \  | |_/ /  | |_/ /
+  |   |     |                    \ /      /   |  ___|  | | | | \ \ | | | |   ) )   ( (     ) ) |  _ (   |  _ (
+  |   |     |                     /      /    | |      | | | |  \ \| | | |  / /     \ \   / /  | | \ \  | | \ \
+  |   |     |                    /      /     | |      | | | |   \   | | |_/ / _____ \ \_/ /   | |  \ \ | |_/ /
+  |   |     |___________________/      /      |_|      |_| |_|    \__| |____/ |_____| \___/    |_|  |_| |____/
+  |   |                               /
+  |   |                              /          Software for the discriminating astronomer
+  |   |                             /
+  |   |      ______________________/
+  |   |     |                     /             Find_Orb orbit determination software
+  |   |     |____________________/              Version $v
+  |   |     |                                   https://www.projectpluto.com/find_orb.htm
+  |   |     |
+  |   |     |
+  |   |     |                                   $e1
+  |   |     |                            /|     $e2
+  |   |     |                           / |
+  |   |     |                          /  |     $d
+  |   |     |_________________________/   |     $j
+  |  /                                    |     $m
+  | /                                     |
+  |/                                      |
+  /_______________________________________|
+ /                                       /
+/_______________________________________/
+
+35 111
+  ________________________________
+ /\                               \         ___  ___    __    ___ ____   __  _____    ___  _   .   . _____  __
+/  \                               \        |  \ |  \  /  \     | |     /  \   |      |  \ |   |   |   |   /  \
+\   \                               \       |__/ |__/ /    \    | |__  /       |      |__/ |   |   |   |  /    \
+ \   \      ___________________      \      |    |  \ \    /    | |    \       |      |    |   |   |   |  \    /
+  |   |     |                  \      \     |    |   \ \__/  \__| |___  \__/   |      |    |__  \_/    |   \__/
+  |   |     |________________   \      \
+  |   |     |                \   \      \     _______  ___ ___      ___ _____          ___   _____    _____
+  |   |     |                 \   \      \    |      '  |   | \      |   |   \        /   \   |   \    |   \
+  |   |     |                  \   \      \   |         |   |  \     |   |    \      /     \  |    )   |    )
+  |   |     |                   \   )      )  |_____    |   |   \    |   |     |    |       | |___/    |___/
+  |   |     |                    \ /      /   |         |   |    \   |   |     |    |       | |   \    |   \
+  |   |     |                     /      /    |         |   |     \  |   |    /      \     /  |    \   |    )
+  |   |     |                    /      /     |        _|_ _|_     \_|_ _|___/  ____  \___/  _|_    \ _|___/
+  |   |     |___________________/      /
+  |   |                               /
+  |   |                              /          Software for the discriminating astronomer
+  |   |                             /
+  |   |      ______________________/
+  |   |     |                     /             Find_Orb orbit determination software
+  |   |     |____________________/              Version $v
+  |   |     |                                   https://www.projectpluto.com/find_orb.htm
+  |   |     |
+  |   |     |
+  |   |     |                                   $e1
+  |   |     |                            /|     $e2
+  |   |     |                           / |
+  |   |     |                          /  |     $d
+  |   |     |_________________________/   |     $j
+  |  /                                    |     $m
+  | /                                     |
+  |/                                      |
+  /_______________________________________|
+ /                                       /
+/_______________________________________/
+31 102
+  ______________________________
+ /\                             \      ___  ___    __    ___ ____  _ _____    ___  .  .   . _____  __
+/  \                             \     |  \ |  \  /  \     | |    / \  |      |  \ |  |   |   |   /  \
+\   \                             \    |--/ |--/ (    )    | |-- (     |      |--/ |  |   |   |  (    )
+ \   \      _________________      \   |    |  \  \__/  \__| |___ \_/  |      |    |__ \_/    |   \__/
+  |   |     |                \      \
+  |   |     |______________   \      \     _____   _   _     _   ____          ___     _____    _____
+  |   |     |              \   \      \    |  __| | | | \   | | |  _ \        / _ \    |  _ \   |  _ \
+  |   |     |               \   \      \   | |    | | |  \  | | | | \ \      / / \ \   | | \ \  | | \ \
+  |   |     |                \   )      )  | |__  | | |   \ | | | |  \ \    / /   \ \  | |_/ /  | |_/ /
+  |   |     |                 \ /      /   |  __| | | | |\ \| | | |   ) )  ( (     ) ) |  _ (   |  _ (
+  |   |     |                  /      /    | |    | | | | \   | | |  / /    \ \   / /  | | \ \  | | \ \
+  |   |     |_________________/      /     | |    | | | |  \  | | |_/ / ____ \ \_/ /   | |  \ \ | |_/ /
+  |   |                             /      |_|    |_| |_|   \_| |____/ |____| \___/    |_|  |_| |____/
+  |   |                            /
+  |   |                           /
+  |   |      ____________________/
+  |   |     |                   /
+  |   |     |__________________/             Software for the discriminating astronomer
+  |   |     |
+  |   |     |                                Find_Orb orbit determination software
+  |   |     |                          /|    Version $v
+  |   |     |                         / |    https://www.projectpluto.com/find_orb.htm
+  |   |     |                        /  |
+  |   |     |_______________________/   |
+  |  /                                  |    $e1
+  | /                                   |    $e2
+  |/                                    |
+  /_____________________________________|    $d
+ /                                     /     $j
+/_____________________________________/      $m
+27 99
+  __________________________     ___  ___    __    ___ ____  _ _____    ___  .  .   . _____  __
+ /\                         \    |  \ |  \  /  \     | |    / \  |      |  \ |  |   |   |   /  \
+/  \                         \   |--/ |--/ (    )    | |-- (     |      |--/ |  |   |   |  (    )
+\   \                         \  |    |  \  \__/  \__| |___ \_/  |      |    |__ \_/    |   \__/
+ \   \      _____________      \
+  |   |     |            \      \     _____   _   __     _   _____         ___     _____    _____
+  |   |     |__________   \      \    | ___| | |  | \   | |  |  _ \       / _ \    |  _ \   |  _ \
+  |   |     |          \   \      \   | |    | |  |  \  | |  | | \ \     / / \ \   | | \ \  | | \ \
+  |   |     |           \   )      )  | |__  | |  |   \ | |  | |  \ \   / /   \ \  | |_/ /  | |_/ /
+  |   |     |            \ /      /   |  __| | |  | |\ \| |  | |   ) ) ( (     ) ) |  _ (   |  _ (
+  |   |     |_____________/      /    | |    | |  | | \   |  | |  / /   \ \   / /  | | \ \  | | \ \
+  |   |                         /     | |    | |  | |  \  |  | |_/ / ___ \ \_/ /   | |  \ \ | |_/ /
+  |   |                        /      |_|    |_|  |_|   \_|  |____/ |___| \___/    |_|  |_| |____/
+  |   |                       /
+  |   |      ________________/            Software for the discriminating astronomer
+  |   |     |               /
+  |   |     |______________/              Find_Orb orbit determination software
+  |   |     |                      /|     Version $v
+  |   |     |                     / |     https://www.projectpluto.com/find_orb.htm
+  |   |     |                    /  |
+  |   |     |___________________/   |
+  |  /                              |     $e1
+  | /                               |     $e2
+  |/                                |
+  /_________________________________|     $d
+ /                                 /      $j
+/_________________________________/       $m
+22 84
+ ______________________         __ __   _   __ __  _ ___  __ _ .   .___ _
+/\                     \        |_)|_) / \   | |_ /   |   |_)| |   | | / \
+\ \                     \       |  | \ \_/ \_| |_ \_, |   |  |_ \_/  | \_/
+ | |     ___________     \    _____  ___  _   _   ___        ___    _____   _____
+ | |     |_________ \     \   | ___| | | | \ | | |   \      / _ \   |  _ \  |  _ \
+ | |     |         \ \     \  | |_   | | |  \| | | |\ \    / / \ \  | |_) ) | |_) )
+ | |     |          \ )     ) |  _|  | | |     | | | ) )  ( (   ) ) |  _ (  |  _ (
+ | |     |           /     /  | |    | | | |\  | | |/ / __ \ \_/ /  | | \ \ | |_) )
+ | |     |__________/     /   |_|    |_| |_| \_| |___/ |__| \___/   |_| |_| |____/
+ | |                     /
+ | |                    /      Software for the discriminating astronomer
+ | |     ______________/
+ | |     |____________/        Find_Orb orbit determination software
+ | |     |                     Version $v
+ | |     |                     https://www.projectpluto.com/find_orb.htm
+ | |     |
+ | |     |                /|   $e1
+ | |     |_______________/ |   $e2
+ | |                       |
+ |/                        |   $d
+ /_________________________|   $j
+/_________________________/    $m
+22 72
+ ______________________
+/\                     \       __ __   _   __ __  _ ___  __ _ .   .___ _
+\ \     ____________    \      |_)|_) / \   | |_ /   |   |_)| |   | | / \
+ | |    |__________ \    \     |  | \ \_/ \_| |_ \_, |   |  |_ \_/  | \_/
+ | |    |          \ \    \    ____  _ _    _ ___        __   ____  ____
+ | |    |           \ \    \   |   ' | |\   | |  \      /  \  |   ) |   )
+ | |    |            \ )    )  |__   | | \  | |   \    /    \ |__/  |__/
+ | |    |             /    /   |     | |  \ | |   /    \    / |  \  |  \
+ | |    |            /    /    |     | |   \| |__/ ____ \__/  |   \ |___)
+ | |    |___________/    /
+ | |                    /      Software for the discriminating astronomer
+ | |     ______________/
+ | |    |_____________/        Find_Orb orbit determination software
+ | |    |                      Version $v
+ | |    |                      https://www.projectpluto.com/find_orb.htm
+ | |    |
+ | |    |                      $e1
+ | |    |                 /|   $e2
+ | |    |________________/ |
+ |/                        |   $d
+ /_________________________|   $j
+/_________________________/    $m
+22 71
+ ______________________
+/\                     \      __ __   _   __ __  _ ___  __ _ .   .___ _
+\ \     ____________    \     |_)|_) / \   | |_ /   |   |_)| |   | | / \
+ | |    |__________ \    \    |  | \ \_/ \_| |_ \_, |   |  |_ \_/  | \_/
+ | |    |          \ \    \       ___ . _   _  _      _  ___  ___
+ | |    |           \ \    \      |   | |\  | | \    / \ |  ) |  )
+ | |    |            \ )    )     |-- | | \ | |  )  (   )|-<  |-<
+ | |    |             /    /      |   | |  \| |_/ __ \_/ |  | |__)
+ | |    |            /    /
+ | |    |___________/    /
+ | |                    /      Software for the discriminating astronomer
+ | |     ______________/
+ | |    |_____________/        Find_Orb orbit determination software
+ | |    |                      Version $v
+ | |    |                      https://www.projectpluto.com/find_orb.htm
+ | |    |
+ | |    |                      $e1
+ | |    |                 /|   $e2
+ | |    |________________/ |
+ |/                        |   $d
+ /_________________________|   $j
+/_________________________/    $m
+18 73
+ ___________________      __ __   _   __ __  _ ___  __ _ .   .___ _
+/\                  \     |_)|_) / \   | |_ /   |   |_)| |   | | / \
+\ \     _________    \    |  | \ \_/ \_| |_ \_, |   |  |_ \_/  | \_/
+ | |    |_______ \    \     ___ . _   _  _      _  ___  ___
+ | |    |       \ \    \    |   | |\  | | \    / \ |  ) |  )
+ | |    |        \ )    )   |-- | | \ | |  )  (   )|-<  |-<
+ | |    |         /    /    |   | |  \| |_/ __ \_/ |  | |__)
+ | |    |________/    /
+ | |                 /      Software for the discriminating astronomer
+ | |     ___________/       Find_Orb orbit determination software
+ | |    |__________/        Version $v
+ | |    |                   https://www.projectpluto.com/find_orb.htm
+ | |    |
+ | |    |              /|   $e1
+ | |    |_____________/ |   $e2
+ |/                     |
+ /______________________|   $d
+/______________________/    $j
+13 62
+______________     __ __   _   __ __  _ ___  __ _ .   .___ _
+\             \    |_)|_) / \   | |_ /   |   |_)| |   | | / \
+ |   _______   \   |  | \ \_/ \_| |_ \_, |   |  |_ \_/  | \_/
+ |   |      \   \
+ |   |       )   )  Software for the discriminating astronomer
+ |   |______/   /
+ |             /    Find_Orb orbit determination software
+ |   _________/     Version $v
+ |   |              https://www.projectpluto.com/find_orb.htm
+ |   |         /|   $e1
+ |   |________/ |   $e2
+ |              |   $d
+/_______________|   $j
 10 45
 __________
-\  ______ \
+\  ______ \    Project Pluto
  | |     \ \
- | |      ) )  Project Pluto
- | |_____/ /
- | _______/    Find_Orb orbit determination software
- | |           Version $v
- | |           www.projectpluto.com/find_orb.htm
- | |_______/|
-/___________|
+ | |      ) )  Find_Orb orbit determination software
+ | |_____/ /   Version $v
+ | _______/    www.projectpluto.com/find_orb.htm
+ | |           $e1
+ | |           $e2
+ | |_______/|  $d
+/___________|  $j
diff --git a/sw_xvt.c b/sw_xvt.c
index e038ca69..7224b886 100644
--- a/sw_xvt.c
+++ b/sw_xvt.c
@@ -113,7 +113,7 @@ static void add_half_exposure( char *obuff, const char *itime,
    const double seconds = get_base_sixty( itime) * 3600. + exposure_time / 2.;
    const int millisec = (int)( seconds * 1000. + .5);
 
-   sprintf( obuff, "%02d:%02d:%02d.%03d",
+   snprintf( obuff, 16, "%02d:%02d:%02d.%03d",
                   millisec / 3600000, (millisec / 60000) % 60,  /* HH MM */
                   (millisec / 1000) % 60, millisec % 1000);    /* SS.sss */
 }
diff --git a/sw_xvt2.c b/sw_xvt2.c
index c8045d69..8a3bc7e7 100644
--- a/sw_xvt2.c
+++ b/sw_xvt2.c
@@ -112,7 +112,7 @@ static void add_half_exposure( char *obuff, const char *itime,
    const double seconds = get_base_sixty( itime) * 3600. + exposure_time / 2.;
    const int millisec = (int)( seconds * 1000. + .5);
 
-   sprintf( obuff, "%02d:%02d:%02d.%03d",
+   snprintf( obuff, 16, "%02d:%02d:%02d.%03d",
                   millisec / 3600000, (millisec / 60000) % 60,  /* HH MM */
                   (millisec / 1000) % 60, millisec % 1000);    /* SS.sss */
 }
diff --git a/sw_xvt3.c b/sw_xvt3.c
new file mode 100644
index 00000000..02d5f030
--- /dev/null
+++ b/sw_xvt3.c
@@ -0,0 +1,184 @@
+/* sw_xvt2.c: converter for "current format" Spacewatch logs
+
+Copyright (C) 2010, Project Pluto
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.    */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+
+/* Code to convert Spacewatch pointing logs from 2018 May 17 to the
+present,  from a file sent 2023 July 21 by Cassandry Joly as
+
+cleaned_0_9_meter_2018_2023.txt
+
+Also see 'cssfield.c' for comments on the
+format of the output from this program;  and see 'sw_xvt.c' and 'sw_xvt2.c'
+for conversions from previous eras.  Compile with
+
+gcc -Wall -Wextra -pedantic -Werror -O3 -o sw_xvt3 sw_xvt3.c     */
+
+static double get_base_sixty( const char *buff)
+{
+   return( atof( buff) + atof( buff + 3) / 60. + atof( buff + 6) / 3600.);
+}
+
+/* Looks for nn:nn:nn sequence */
+
+const char *find_base_60( const char *buff)
+{
+   const char *rval = strchr( buff + 3, ':');
+   int i;
+
+   if( rval)
+      {
+      rval -= 2;
+      for( i = 0; rval && i < 8; i++)
+         if( i == 2 || i == 5)
+            {
+            if( rval[i] != ':')
+               rval = NULL;
+            }
+         else if( !isdigit( rval[i]))
+            rval = NULL;
+      }
+   return( rval);
+}
+
+/* The Spacewatch logs give the time for the start of the exposure,  and
+we really want the midpoint time.  Fortunately,  Spacewatch never observes
+near 00:00:00 UTC,  so we can just add half the exposure time and leave the
+day/month/year ignored. */
+
+static void add_half_exposure( char *obuff, const char *itime,
+                              const double exposure_time)
+{
+   const double seconds = get_base_sixty( itime) * 3600. + exposure_time / 2.;
+   const int millisec = (int)( seconds * 1000. + .5);
+
+   assert( millisec >= 0 && millisec < 86400000);
+   snprintf( obuff, 14, "%02d:%02d:%02d.%03d",
+                  millisec / 3600000, (millisec / 60000) % 60,  /* HH MM */
+                  (millisec / 1000) % 60, millisec % 1000);    /* SS.sss */
+}
+
+#define INTENTIONALLY_UNUSED_PARAMETER( param) (void)(param)
+
+int main( const int argc, const char **argv)
+{
+   const char *filename = (argc == 1 ? "cleaned_0.9_MR-condensed_2023_cleaned.txt" : argv[1]);
+   FILE *ifile = fopen( filename, "rb");
+   char buff[200];
+   const char *mpc_code = NULL;
+   double curr_exposure = 0.;
+   const double min_exposure = 0.1;
+             /* accept all exposures,  including very short focussing ones */
+
+   assert( ifile);
+   if( !fgets( buff, sizeof( buff), ifile))
+      {
+      fprintf( stderr, "Didn't read header\n");
+      return( -1);
+      }
+   printf( "# Spacewatch 'latest formula' logs,  processed with sw_xvt3.c (q.v.)\n");
+#ifdef __TIMESTAMP__
+   printf( "# Source file date %s\n", __TIMESTAMP__);
+#else
+   printf( "# Version %s %s\n", __DATE__, __TIME__);
+#endif
+   printf( "# Input file '%s'\n", filename);
+   while( fgets( buff, sizeof( buff), ifile))
+      {
+      char *fields[7], time_text[20];
+      int i, n_fields;
+
+      for( i = n_fields = 0; buff[i] && n_fields < 6; i++)
+         if( buff[i] == '\t')
+            {
+            buff[i] = '\0';
+            fields[n_fields++] = buff + i + 1;
+            }
+         else if( buff[i] < ' ')
+            buff[i] = '\0';         /* remove trailing CR/LF */
+      assert( n_fields == 5);
+      if( !mpc_code)
+         {
+         if( !memcmp( buff, "Mosaic_Recovery_0.9m", 20))
+            mpc_code = "691";
+         else if( !memcmp( buff, "Finger_Lakes_1.8m", 17))
+            mpc_code = "291";
+         else if( !memcmp( buff, "SW_Cassegrain_Camera_2.3m", 24))
+            mpc_code = "V00";
+         if( !mpc_code)
+            {
+            fprintf( stderr, "No MPC code\n%s", buff);
+            return( -1);
+            }
+         }
+      assert( mpc_code);
+      assert( strlen( fields[1]) < 16);      /* if HH:MM:SS.ssssss */
+      strcpy( time_text, fields[1]);
+      if( 8 == strlen( time_text))        /* some times lack milliseconds */
+         strcat( time_text, ".000");
+      if( strlen( time_text) > 11 && time_text[2] == ':'
+                          && time_text[5] == ':' && time_text[8] == '.')
+         {
+         char midtime[20];
+
+         assert( fields[4][0] == '+' || fields[4][0] == '-');
+         if( *fields[2]  && curr_exposure != atof( fields[2]))
+            {
+            curr_exposure = atof( fields[2]);
+            printf( "# Exposure: %.0f s\n", curr_exposure);
+            assert( curr_exposure > min_exposure);
+            }
+         printf( "%.4f,%c%.4f,%sT", get_base_sixty( fields[3]) * 15, fields[4][0],
+                                get_base_sixty( fields[4] + 1), fields[0]);
+         time_text[12] = '\0';   /* truncate to milliseconds */
+         add_half_exposure( midtime, time_text, curr_exposure);
+         printf( "%s,%s,%s\n", midtime, mpc_code, buff);
+         }
+      else
+         printf( "# Malformed '%s', %s", time_text, buff);
+      }
+   fclose( ifile);
+   return( 0);
+}
+
+/*
+   An example of text from a "new-formula" Spacewatch pointing log :
+
+0.9-m Log: 2016 Apr 14 UT
+
+01   K16EF8K   11:33:50.3   +01:34:08   Exp: 272 (x 3)  M. T. Read  Not Found
+   Ephem Info - Mag(V): 21.1   Rates: -093.8, -031.3   Unc: 65  Type: NEO
+Recovery Info - Mag(R): N/A     Rates: N/A, N/A   Mode: Sid  O-C: N/G
+Focus: Unk
+ Pass       Time      FWHM(")  EL     AZ      Xoff*  Yoff*   Rot     T2(C)
+Pass 1   03:52:25.88  1.2     51.8   138.1  -008.5  +035.0   Unk      Unk
+Pass 2   03:58:40.49  1.1     52.7   140.2  -008.9  +035.0   Unk      Unk
+Pass 3   04:04:55.12  1.1     53.5   142.4  -009.6  +034.3   Unk      Unk
+
+   This is telling me that on 2016 Apr 14,  three images were taken centered
+at RA=11:33:50.3,  dec=+01:34:08 (in epoch of date),  at 03:52:25.88, 03:58:40.49,
+and 04:04:55.12 UTC. The exposures were all 272 seconds long,  with seeing
+given as FWHM.
+
+   For field sizes and much more,  see comments in 'sw_xvt.c'.
+*/
diff --git a/wat_find.lnk b/wat_find.lnk
index ced41f48..701c9b80 100644
--- a/wat_find.lnk
+++ b/wat_find.lnk
@@ -1 +1 @@
-option stub=dos32a option map=find_orb.map option stack=20000 f findorb.obj, b32_eph.obj, bc405.obj, collide.obj, conv_ele.obj, eigen.obj, elem2tle.obj, elem_out.obj, ephem0.obj, gauss.obj, jpleph.obj, lsquare.obj, moid4.obj, monte0.obj, mpc_obs.obj, orb_func.obj, orb_fun2.obj, pl_cache.obj, roots.obj, runge.obj, sm_vsop.obj, sr.obj, tle_out.obj, sigma.obj
+option stub=dos32a option map=find_orb.map option stack=20000 f findorb.obj, bc405.obj, collide.obj, conv_ele.obj, eigen.obj, elem2tle.obj, elem_out.obj, ephem0.obj, gauss.obj, jpleph.obj, lsquare.obj, moid4.obj, monte0.obj, mpc_obs.obj, orb_func.obj, orb_fun2.obj, pl_cache.obj, roots.obj, runge.obj, shellsor.obj, sm_vsop.obj, sr.obj, tle_out.obj, sigma.obj
diff --git a/watfind.mak b/watfind.mak
index 72d68a79..3e8e44b0 100644
--- a/watfind.mak
+++ b/watfind.mak
@@ -1,23 +1,26 @@
 # Make file for find_orb with the Watcom C/C++ compiler.
 # Version using PDCurses.
 
-LINK_OPTS=l find_orb.lib l ..\jpl_eph\WJPLEPH.LIB l ..\lunar\WAFUNCS.LIB l ..\PDCurs~1\dos\PDCURSES.LIB l ..\sat_code\WSATLIB.LIB
+PDC_DIR=..\PDCurs~1
+PDC_LIB=$(PDC_DIR)\dosvga\PDCURSES.LIB
+LIB_DIR=..\watlib
+LINK_OPTS=l find_orb.lib l $(LIB_DIR)\WJPLEPH.LIB l $(LIB_DIR)\WAFUNCS.LIB l $(PDC_LIB) l $(LIB_DIR)\WSATLIB.LIB
 # LINK_OPTS=l wafuncs.lib l wjpleph.lib l wsatlib.lib l find_orb.lib l pdcurses.lib f clipfunc.obj
 CURSES_OBJ=clipfunc.obj getstrex.obj
 CURSES_OBJ_COMMAS=clipfunc.obj, getstrex.obj
 
 all: find_orb.exe fo.exe fo_serve.exe
 
-LINKOPTS=option stub=dos32a option map=find_orb.map option stack=20000 f ..\PDCursesMod\dos\PDCURSES.LIB
+LINKOPTS=option stub=dos32a option map=find_orb.map option stack=20000 f $(PDC_LIB)
 
-OBJS=ades_out.obj b32_eph.obj bc405.obj bias.obj collide.obj conv_ele.obj &
+OBJS=ades_out.obj bc405.obj bias.obj collide.obj conv_ele.obj &
   details.obj eigen.obj elem2tle.obj elem_out.obj elem_ou2.obj ephem0.obj &
   errors.obj expcalc.obj gauss.obj geo_pot.obj healpix.obj lsquare.obj &
   miscell.obj monte0.obj mpc_obs.obj &
 !ifeq DOS Y
   $(CURSES_OBJ) &
 !endif
-  nanosecs.obj orb_func.obj orb_fun2.obj pl_cache.obj roots.obj &
+  orb_func.obj orb_fun2.obj pl_cache.obj roots.obj &
   runge.obj simplex.obj sm_vsop.obj sr.obj shellsor.obj sigma.obj stackall.obj
 
 find_orb.lib: $(OBJS)
@@ -65,8 +68,8 @@ CFLAGS=/Ox /W3 /4r /s /j /zq -i=..\include
    wpp386 $(CFLAGS) $<
 
 findorb.obj : findorb.cpp
-   wpp386 $(CFLAGS) -i=..\PDCursesMod $<
+   wpp386 $(CFLAGS) -i=$(PDC_DIR) $<
 
-getstrex.obj : getstrex.c
-   wcc386 $(CFLAGS) -i=..\PDCursesMod $<
+getstrex.obj : getstrex.cpp
+   wpp386 $(CFLAGS) -i=$(PDC_DIR) $<
 
diff --git a/worldmap.txt b/worldmap.txt
index db4387ff..db01da3f 100644
--- a/worldmap.txt
+++ b/worldmap.txt
@@ -117,22 +117,22 @@ modified               |      |__     |   ',,,|
 
 
 
-                 _,__        .:
-         Darwin <*  /        | \
-            .-./     |.     :  :,
-           /    |      '-._/     \_
-          /     |   NT   | '       \
-        .'      |        |   QLD   *: Brisbane
-     .-'        |        |           ;
-     |   WA     |----------|         |
-     \          |          |--------/
-      |         |   SA     | NSW   /
-Perth  \*       |__.--._   |-,_   /
-        \     _.'       \:.|VIC'-,|
-        >__,-'             \_/*_.-'
-                              Melbourne
-                             :--,
-                              '/
+                    ,__        .:
+         Darwin    *   --.     | \
+            .---,_/     /     :  :,
+           /      |      '-._/     \_
+          /       |  N.T.  |         \
+      _..'        |        |   Qld.   \
+     (            |        |           )
+     |    W.A.    |----------,        *; Brisbane
+     \            |          |---------|
+      |           |   S.A.   | N.S.W. /
+Perth  *          |__.--._   |-,_    * Sydney
+       )      ___.'       \*.|Vic'-,/
+       >.__,-'     Adelaide  \_,*_.-'
+                                Melbourne
+                                :--,
+                           Tas.  \*  Hobart
 
          Shanaka Dias (modified)
 
@@ -156,3 +156,49 @@ Perth  \*       |__.--._   |-,_   /
                                             '-----|___ |__      /
                                                       '____>---'
 
+
+
+                                      |
+                                      |            _
+                                      |           /                 ,--,,-,
+            Yukon                     |          /               () |      \
+                                      |         /                   |       '--.
+______________________________________|________/     Hudson Bay     \          | o
+               |           |          |        (                    /          |_  _/|\
+               |           |          |        '-;                 |_            \/  ( \
+               |           |          |           )                  \                \ \
+ _  British    |           |          |           '-^-\               |               /  )
+  \  Columb    |  Alberta  |  Saska   |  Manitoba   _/ `\_           _)               \  \_
+  ;            |           |          |           _/      `---,   _,/             /\_ /    \__
+ \             |           |          |         _/             )  \              (   V        \_
+  \_           |_          |          |        /               (   |              L  Labrador   |
+    )            \_        |          |       |                 \  )               \  _________ )
+    \              \_      |          |       |    Ontario       \/   Quebec        `-      _,-|,
+     \_              \     |          |       |                   |               ________,/  //
+       \   ___________|____|__________|_______|        ___        |            ,-'___ \=,    / `|__
+        `-'       ||               |        |  `--,___/   \       |            ,-"___)      / NF   )
+         \ Wash   | `,  Montana    | NDak   |Minn  /___   _)      |            /- NB )    _ '---,_//)
+         |-.______|_  |            |________|     /    `~'_\      \__         /  |   \==_/_\      '-`
+         \         |   \__---------|        \    | Wisc /' / )       `\ __---+ME >-,=`___/
+          } Oregon |Idaho |        | SDak    )____\     | /MI|     ---;'  | /|_/'  \_/
+          |        |      |  Wyo   |--------/      \__ /  |   \_,-/--- NY |__/
+          +----+-------+--|        | Nebr    \Iowa  )  `+--+--(_/=------  /__\
+          |    | Nev   |  `--------+-+________-----( IL |IN|     | PA   )(==
+          \    |_      |Utah |       |        \     |   |  | OH_/ -=|--(
+           \     \_    |     |Colo   |  Kansas | MO  \ _|,-^--< __/VA\ |
+            \Calif \_ +------+------+|__-------+_____ =________\______\
+             \       \|      |      |   | Okla | Ark /______.='__ NC  )
+              `--,    |NMex  |Ariz  |   `-.____|    |  |  |   \  `-\-'
+                  \___|      |   ___|           \---|MS|AL\ GA \__/
+                   \  _,-,___|'-<,    Texas     )LA/   |___|____/
+                    \ L |         \  __        /__ '-+-'--.__ FL)
+                     \ \ \_        `/  \    __/   `--'       `) \
+                      \_\_ \            \  /                  (  |
+                        \ \ \_           `-|                   \_/
+                         \_\  \_           |
+                           \\   \          |                 ,---,__
+                                 \         |         _--,   (/`""'__'-,_
+                                 /_         \       (   /           `>__\ __ __
+                                   \_        \____,-`   |           __   -\ (__)
+                                     `--,_     _                    `-`  '"-'
+                                          ----" \
diff --git a/xdesig.txt b/xdesig.txt
index 507c54d1..205d3de7 100644
--- a/xdesig.txt
+++ b/xdesig.txt
@@ -166,64 +166,6 @@ INTEGRAL     2002-048A    2002-048A = NORAD 27540 = Integral
     SK02N040 N013S        Neptune XIII = S/2002 N4 = Neso
     SK03J030 J060S        Jupiter LX = S/2003 J 3
 
-;  When Herschel/Planck launched in May 2009,  there was some initial
-; confusion as to which object was which.  So five of them got temporary
-; designations HPO1 through HPO5.
-HPO1         2009-026D    Sylda
-HPO2         2009-026A    Herschel
-Herschel     2009-026A    Herschel
-Planck       2009-026B    Planck
-HPO3         2009-026C    Booster
-HPO4         2009-026E    object5
-HPO5         2009-026F    object6 (the accelerating one)
-
      Pluto   D4340        Pluto = (134340)
-     GAIA    2013-074A    Gaia
-     WE0913A 2015-007B    WE0913A = DSCOVR object = 2015-007B = NORAD 40391
-WE0913A      2015-007B    WE0913A = DSCOVR object = 2015-007B = NORAD 40391
-     WT1CD40 2015-007B    WE0913A = DSCOVR object = 2015-007B = NORAD 40391
-     9U01FF6      WT1190F WT1190F = UDA34A3 = UW8551D = 9U01FF6
-     UDA34A3      WT1190F WT1190F = UDA34A3 = UW8551D = 9U01FF6
-     UW8551D      WT1190F WT1190F = UDA34A3 = UW8551D = 9U01FF6
-SPEKTR-R     2011-037A    Spektr-R
-     UE2A938 1972-073A    UE2A938 = IMP7 = 1972-073A
-IMP7         1972-073A    UE2A938 = IMP7 = 1972-073A
-IMP-7        1972-073A    UE2A938 = IMP7 = 1972-073A
-IMP8         1973-078A    IMP-8 = NORAD 06893
-TA29DCF      2011-037B    2011-037B = TA29DCF = Spektr-R Booster
-     WF839BF 2015-011A    2015-011A = WF839BF = MMS 1
-     WF839C0 2015-011D    2015-011D = WF839C0 = MMS 4
-     WF839C1 2015-011B    2015-011B = WF839C1 = MMS 2
-     WF839C2 2015-011C    2015-011C = WF839C2 = MMS 3
-     WF839C3 2015-011E    2015-011E = WF839C3 = MMS obj
-     WF839C4 2015-011F    2015-011F = WF839C4 = MMS obj
-     6J6231C 1992-044A    Geotail = NORAD 22049
-     6J13FB2 1992-044A    Geotail = NORAD 22049
-     Geotail 1992-044A    Geotail = NORAD 22049
-     WF0AEDA 2009-068B    2009-068B = NORAD 36109 = WF0AEDA = WGS 3 rk = S509590
-S509590      2009-068B    2009-068B = NORAD 36109 = WF0AEDA = WGS 3 rk = S509590
-     8UB56DA 2008-051A    TR93D0F = IBEX = NORAD 33401
-     TR93D0F 2008-051A    TR93D0F = IBEX = NORAD 33401
-     9W13082 2007-004C    Themis-C
-CXO          1999-040B    Chandra
-     WB31C9F 1976-023C    WB31C9F = XC83E0D = SOLRAD 11A
-     6N070E8 1976-023C    WB31C9F = XC83E0D = SOLRAD 11A
-     6N070E7 1976-023C    WB31C9F = XC83E0D = SOLRAD 11A
-     XC83E0D 1976-023C    WB31C9F = XC83E0D = SOLRAD 11A
 
-     M70pEPX ExoMars1     ExoMars hardware
-     M70pF8A ExoMars1     ExoMars hardware
-     M70pGbh ExoMars1     ExoMars hardware
-     WJ2AD07 2015-019C    2015-019C = NORAD 41929 = S509356 = WJ2AD07
-     S509356 2015-019C    2015-019C = NORAD 41929 = S509356 = WJ2AD07
-S509356      2015-019C    2015-019C = NORAD 41929 = S509356 = WJ2AD07
-     S509433      S509474 1999-066A = XMM-Newton = NORAD 25989 = S509474 = S509433
-1999-066A         S509474 1999-066A = XMM-Newton = NORAD 25989 = S509474 = S509433
-     S509434 2013-041B    2013-041B = NORAD 39224 = WGS 6 Rk
-     S509558 2013-041B    2013-041B = NORAD 39224 = WGS 6 Rk
-S510599      2016-031B    2016-031B = NORAD 41553 = S510599
-     S510599 2016-031B    2016-031B = NORAD 41553 = S510599
-     S509207 2015-019C    2015-019C = NORAD 41929 = S509356 = WJ2AD07
-ORX          2016-055A    2016-055A = OSIRIS-REx
-     Osiris  2016-055A    2016-055A = OSIRIS-REx
 0001I            AK17U010 1I/`Oumuamua