Some improvements of the WindowSwitcher