Some minor code changes and improvements before processing the whole file.

Now that I actually have all the data indexed and ready for use I
can go on to the fun part of applying it to sentences. But first I
need to implement a test bed.