Pagination example and minor changes