several little changes to get into CRAN; removed vignette temporarily