yet more mods; still need to test