More SM tweaks based on playtesting