pagination, second pass
pagination, bug fix
pagination, bug fix 2
pagination, bug fix to template