completelyfix s2w/d2w
More fixes for dtw/s2w