Expanded mref paging + bug fixes