Continued with wppresorce.ts + several corrections to others after
testing.