mostly fix paging