Fixed a bunch of issues with paging

Also added the same paging to comments