- fixed paginator
- some enhancements