Complete implementation s2w and dt2w
Based on commit by: Anarkia1976 and hellsgod
Thanks for them ;>