sync up with latest Wt
various fixes for small glitches (trailing Wt)