More Tweaks + Remove YieldMod and Mutmod on trays