Pagination complete. Various other polishing ups