Fixed mixed tabs/spaces in several files and missing line in capture the key.