Documenting and fixed pagination