minor mods for production