Fixed cgr-cal to use new gplot object