Mod: Several minor changes.