better pagination + fixes