wxs-three-*

More small changes