Finalizing pagination. A few other minor fixes.
Merge branch 'dirpagination' into develop