Incorporating Daves fixes and aligning Paginator