Tweak Q, and Fix W bug