Updates to bspkrs' and Lunatrius' mods