Lots Of Bug Fixes, Started Pagination