remainder of updates for v2.1.8 submitted to cran