Page numbering.

Fixed the page number totals when doing partial matches.
Also removed the @dolist at the end that was intended to be a temporary
installation measure.