diff --git a/makeplots.R b/makeplots.R
index 0427845d0cb65f65557882bb652b1b3ada730e17..72f0157399a226f93efc04ccce37767a69cca162 100755
--- a/makeplots.R
+++ b/makeplots.R
@@ -1,10 +1,12 @@
 #!R -f
-library(ggplot2)
-library(ggthemes)
-library(scales)
-library(xtable)
-library(grid)
-library(dplyr)
+
+(function(lp) {
+np <- lp[!(lp %in% installed.packages()[,"Package"])]
+if(length(np)) install.packages(np,repos=c("http://cran.rstudio.com/"))
+x <- lapply(lp,function(x){library(x,character.only=TRUE)}) 
+})(c("ggplot2", "ggthemes", "scales", "xtable", "grid", "dplyr"))
+
+
 
 all <- read.csv("results.tsv",sep="\t",header=F, stringsAsFactors=F)
 names(all) <- c("exp", "sys", "conf", "s", "r", "timesec")
@@ -32,9 +34,9 @@ d <- all %>% filter(exp=="survey") %>% group_by(sys, s, conf) %>%
 	summarize(meant=mean(timesec), se=se(timesec)) %>% 
 	mutate(tool=paste(sys,conf), 
 		datasize=sapply(s, switch, alabama=47512, california=1060060, acs3yr=9093077)) %>% 
-	filter(tool == "Renjin jitopt" | sys != "Renjin")
+	filter(tool %in% c("Renjin jitopt", "Renjin none", "Renjin 1t") | sys == "GNU R")
 
-print(d %>% select(sys,s,meant) %>% arrange(s))
+print(d)
 
 limits <- aes(ymax = meant + se, ymin=meant - se, width=2)
 
@@ -47,16 +49,15 @@ ggplot(d,aes(datasize,meant,group=tool)) +
 
 	xlab("Dataset Size (elements, log scale)") + ylab("Execution Time (s)") + theme +
 	annotate("text", x=10^6.6, y=45, label="GNU R", family="serif", size=10)+
-	annotate("text", x=10^6.4, y=100, label="sqlsurvey", family="serif", size=10)+
-	annotate("text", x=10^6.8, y=15, label="Renjin", family="serif", size=10)
+	annotate("text", x=10^6.4, y=100, label="Renjin -opt", family="serif", size=10)+
+	annotate("text", x=10^6.8, y=-1, label="Renjin", family="serif", size=10)+
+	annotate("text", x=10^6.8, y=20, label="Renjin 1t", family="serif", size=10)
 
 	#scale_color_brewer(palette=cBrwPl) +
  #guides(colour=guide_legend(keywidth=3.5))
 
 dev.off()
 
-
-
 # parallel