improve comment descriptions
to paginatedchoice
to paginatedchoice
add tests