Updates to stuff, mostly to WM stuff (IIRC)