Fixed a couple bugs, began working on pagination