Paginator: fix model paginator->next off by one

* page next always one less than it should be
* cleaned up logic and variables