Awood/pagination fixups

A couple of changes that Jesus requested.