bugfixes, testing pagination