Big update with paging

Added the ability to page and also fixed many issues