Changed s2w detection function a little in hopes of creating less possibility for confusion. If the problem is even s2w...