Geometry gap fix attemp failure - but still worth a backup
Cleansed out the previous geometry gap failure, and some small other fixes.