wip: finishing, debugging many recent mods