Various tweaks and possible s2w fix