a better pager and fixing whitespace