A few changes to move further towards getting the multi-page reading working.