fixes part of #69, and paginates