diff --git a/rfpng.c b/rfpng.c
index a608752..a50e302 100644
--- a/rfpng.c
+++ b/rfpng.c
@@ -47,7 +47,7 @@ int main(int argc,char *argv[])
   float dt,zzmax,s1,s2;
   int ix=0,iy=0,isub=0;
   int i0,j0,i1,j1,jmax;
-  float width=1500,sigma=5.0,foff=0.0;
+  float width=14.0,sigma=5.0,foff=0.0,aspect=1.0;
   float x,y,x0,y0;
   char c;
   char path[128],xlabel[64],ylabel[64],filename[32],tlefile[128],pngfile[128],datfile[128],freqlist[128];
@@ -82,7 +82,7 @@ int main(int argc,char *argv[])
 
   // Read arguments
   if (argc>1) {
-    while ((arg=getopt(argc,argv,"p:f:w:s:l:b:z:hc:C:m:gS:qo:O:F:"))!=-1) {
+    while ((arg=getopt(argc,argv,"p:f:w:s:l:b:z:hc:C:m:gS:qo:O:F:W:A:"))!=-1) {
       switch (arg) {
 	
       case 'p':
@@ -141,10 +141,18 @@ int main(int argc,char *argv[])
       case 'C':
 	site_id=atoi(optarg);
 	break;
+
+      case 'W':
+	width=atof(optarg);
+	break;
+
+      case 'A':
+	aspect=atof(optarg);
+	break;
 	
       case 'm':
 	cmap=atoi(optarg);
-	if (cmap>2)
+	if (cmap>3)
 	  cmap=0;
 	break;
 
@@ -182,7 +190,7 @@ int main(int argc,char *argv[])
 
   cpgopen(pngfile);
   //    cpgctab(cool_l,cool_r,cool_g,cool_b,9,1.0,0.5);
-  cpgpap(14.0, 1.0);
+  cpgpap(width, aspect);
   cpgsch(0.6);
   cpgask(1);
     
@@ -379,14 +387,23 @@ void usage(void)
 {
   printf("rfplot: plot RF observations\n\n");
   printf("-p <path>     Input path to file /a/b/c_??????.bin\n");
+  printf("-o <output>   Output PGPLOT device [<time>_<freq>.png/png]\n");
+  printf("-O <offset>   Frequency offset to apply (Hz) [0]\n");
   printf("-s <start>    Number of starting subintegration [0]\n");
-  printf("-l <length>   Number of subintegrations to plot [3600]\n");
-  printf("-b <nbin>     Number of subintegrations to bin [1]\n");
-  printf("-z <zmax>     Image scaling upper limit [8.0]\n");
   printf("-f <freq>     Frequency to zoom into (Hz)\n");
   printf("-w <bw>       Bandwidth to zoom into (Hz)\n");
-  printf("-O <offset>   Frequency offset to apply (Hz) [0]\n");
+  printf("-l <length>   Number of subintegrations to plot [3600]\n");
   printf("-F <freqlist> List with frequencies [$ST_DATADIR/data/frequencies.txt]\n");
+  printf("-b <nbin>     Number of subintegrations to bin [1]\n");
+  printf("-z <zmax>     Image scaling upper limit [8.0]\n");
+  printf("-c <tlefile>  File with TLEs [$ST_DATADIR/data/bulk.tle]\n");
+  printf("-g            Compute GRAVES reflections\n");
+  printf("-S <sigma>    Significance for peak detection [5.0]\n");
+  printf("-q            Detect and plot peaks\n");
+  printf("-C <site>     Compute predictions for site [$ST_COSPAR]\n");
+  printf("-W <width>    PGPLOT window width [14.0]\n");
+  printf("-A <aspect>   PGPLOT aspect ratio [1.0]\n");
+  printf("-m <cmap>     Colormap index [0: cool, 1: heat, 2: viridis, 3: gray; default: viridis]\n");
   printf("-h            This help\n");
 
   return;
diff --git a/rftrace.c b/rftrace.c
index e8219c4..882f309 100644
--- a/rftrace.c
+++ b/rftrace.c
@@ -474,7 +474,7 @@ int is_classified(int satno)
 // Compute trace
 struct trace *compute_trace(char *tlefile,double *mjd,int n,int site_id,float freq,float bw,int *nsat,int graves,char *freqlist)
 {
-  int i,j,imode,flag,satno,tflag,m,status;
+  int i,j,imode,flag,satno,tflag,m,status,hastle;
   struct point *p;
   struct site s,sg;
   FILE *file,*infile;
@@ -482,7 +482,7 @@ struct trace *compute_trace(char *tlefile,double *mjd,int n,int site_id,float fr
   xyz_t satpos,satvel;
   double dx,dy,dz,dvx,dvy,dvz,r,v,za,vg;
   double freq0;
-  char line[LIM],text[8];
+  char line[LIM];
   struct trace *t;
   float fmin,fmax;
   double ra,de,azi,alt;
@@ -577,10 +577,13 @@ struct trace *compute_trace(char *tlefile,double *mjd,int n,int site_id,float fr
     t[j].classfd=is_classified(t[j].satno);
     t[j].graves=graves;
     
-    sprintf(text," %d",satno);
     // Loop over TLEs
+    hastle=0;
     file=fopen(tlefile,"r");
     while (read_twoline(file,satno,&orb)==0) {
+      if (orb.satno==satno)
+	hastle=1;
+
       // Initialize
       imode=init_sgdp4(&orb);
       if (imode==SGDP4_ERROR) {
@@ -630,7 +633,9 @@ struct trace *compute_trace(char *tlefile,double *mjd,int n,int site_id,float fr
     }
     fclose(file);
 
-    j++;
+    // Increment
+    if (hastle==1)
+      j++;
   }
   fclose(infile);
   fclose(stderr);
@@ -638,6 +643,9 @@ struct trace *compute_trace(char *tlefile,double *mjd,int n,int site_id,float fr
   // Free
   free(p);
 
+  // Update counter
+  *nsat=j;
+  
   return t;
 }