add pagination + fix specs