Improved documentation and modified pagination envelope