Fixed paging, added additional logging output.