Added /w pos1 w.i.p., cleaned several things