Some fixes, some progress, `moffs` left for later.