Minor Paging Changes

Also, took out some comments, will add them back in later