Lots of small changes. Dock paginator.