Minor revisions to R prototype