Fix version
More fixes for matching in the middle of a word, command key bug etc