added some s3 methods for some fxns, other changes