post-pagination / other improvements