updates to pass R CMD CHECK