More adjust...

Sorry for the flood of changes.
As I still do not have the sandbox, let the trial and error...
I believe that now hit the target.
Hugs!