hopefully final changes prior to submitting version 1.22 to CRAN