Paginate and small tweaks