[Sub-Mod] Small Mods and Fixes