Improved shifting of single selected words (recognizes more types now)