Bugs fixed, but still need to clean up data frames for push to cran.