Changes to pagination, some other changes