Minor updates (and bugfixes) to allow an efficient fitting of the physical

No match.