pagination + corrections