Pagination corrections and removal of output folder.