Worked more on refining the matching algorithm.  Also, no it takes into
account the mode of input.