Pagination + Misc. improvements.