Chris' updates + more of the R-code rewritten