fixing generic/S3 warnings.

will submit to CRAN now.