There are some things remaining that I didn't yet take into account because one
had to be logged into see them.

Working on this now. :)