Mod: Various Fixes and Updates

Nothing of consequence