Update of getListOfMatches code to accommodate excluded characters.
Also general improvements to Zephyr.