fixed two minor bugs
fixed paging bugs, still broken