Catching up WM -- tons of improvements