small fixes + pagination