hopefully final tidying up before submitting v1.22.1 to CRAN