diff --git a/makefile b/makefile
index 4d752aa..10afcde 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 LOCPATH = ./bin
 INSTALLPATH = /usr/local
 CFLAGS = -O3
-LFLAGS =  -lm -lncursesw -ldl #-ltinfo #-lasound
+LFLAGS =  -lm -lncurses -ldl -ltinfo #-lasound
 DEBFLAGS = -g -Wall
 NAME = mvc
 
diff --git a/src/fft.c b/src/fft.c
index 1c2c76a..6bdbd61 100644
--- a/src/fft.c
+++ b/src/fft.c
@@ -4,11 +4,13 @@
 /* if flag is EVEN (0), it takes only the even elements
  * otherwise if flag is ODD (1) it takes only the odd ones
  */
-cplx *split_array(cplx *a, int len, int flag)
+cplx *split_array(cplx *a, const int len, const int flag)
 {
 	int i, cnt = 0;
 	cplx *ret = malloc((len/2)*sizeof(cplx));
 
+	if(!ret) return NULL;
+
 	for(i=0+flag; i<len; i=i+2){
 		ret[cnt] = a[i];
 		cnt++;
@@ -19,96 +21,92 @@
 /* recursively compute the fft on an array of complex numbers
  * splitting the array in two parts each recursion
  */
-cplx *_fast_ft(cplx *compArray, int len)
+cplx *_fast_ft(cplx *compArray, const int len)
 {
-	cplx omegaN, omega;
-	cplx *evenA, *oddA, *transformedA;
-	int i;
+  cplx omegaN, omega;
+  cplx *evenA, *oddA, *transformedA;
+  int i;
 
-	/*termination*/
-	if(len == 1){
-		return compArray;
-	}
+  /*termination*/
+  if(len == 1){
+    return compArray;
+  }
 
-	omega = 1;
-	omegaN = cexp(2*PI*I/len); //the fourier coefficient
-    evenA = _fast_ft(split_array(compArray, len, EVEN), len/2);
-	oddA = _fast_ft(split_array(compArray, len, ODD), len/2);
+  omega = 1;
+  omegaN = cexp(2*PI*I/len); //the fourier coefficient
+  evenA = _fast_ft(split_array(compArray, len, EVEN), len/2);
+  oddA = _fast_ft(split_array(compArray, len, ODD), len/2);
 
-	/*the final array*/
-	transformedA = malloc(len*sizeof(cplx));
+  /*the final array*/
+  transformedA = malloc(len*sizeof(cplx));
 
-	for(i=0; i<(len/2); i++){
-		transformedA[i] = evenA[i] + omega*oddA[i];
-		transformedA[i+(len/2)] = evenA[i] - omega*oddA[i];
-		omega = omegaN*omega;
-	}
-	free(evenA);
-	free(oddA);
-	free(compArray);
-	return transformedA;
+  for(i=0; i<(len/2); i++){
+    transformedA[i] = evenA[i] + omega*oddA[i];
+    transformedA[i+(len/2)] = evenA[i] - omega*oddA[i];
+    omega = omegaN*omega;
+  }
+  free(evenA);
+  free(oddA);
+  free(compArray);
+  return transformedA;
 }
 
 void
-print_components(cplx *a, int len)
+print_components(cplx *a, const int len)
 {
-	int i;
-	for(i=0; i<len; i++){
-		/*creal and cimag extract the real and imaginary parts of a[i]*/
-		fprintf(stdout, "%g, %g\n", creal(a[i]), cimag(a[i])); 
-	}
-	fprintf(stdout, "\n");
+  int i;
+  for(i=0; i<len; i++){
+    /*creal and cimag extract the real and imaginary parts of a[i]*/
+    fprintf(stdout, "%g, %g\n", creal(a[i]), cimag(a[i])); 
+  }
+  fprintf(stdout, "\n");
 }
 
 unsigned int
-amplitude(cplx c, unsigned int n)
+amplitude(cplx c, const unsigned int n)
 {
-    // compute a normalized amplitude (actually power spectrum, since it's not squared
-    // normalize on n (N_SAMPLES)
-	double sq = 0;
-	unsigned int res = 0;
+  // compute a normalized amplitude (power spectrum, not squared)
+  double sq = sqrt(pow(creal(c)/n, 2) + pow(cimag(c)/n, 2));
 
-	/*compute amplitude*/
-    sq = sqrt(pow(creal(c)/n, 2) + pow(cimag(c)/n, 2));
-	res = round(20*log10(sq)); // dB scale
-    /*fprintf(stderr, "%f - %d\n", sq, res);*/
-	return res;
+  return round(20*log10(sq)); // dB scale
 }
 
+/**
+ * Not used anymore
 void
-normalize_fft(int inLen, unsigned int* fftSig)
+normalize_fft(const int inLen, unsigned int* fftSig)
 {
-	// normalize by dividing for the amplitude
-	int i;
-	for(i=0; i<inLen; i++){
-		fftSig[i] = (int)(10*fftSig[i]/(20*log10(fftSig[512])));
-		fprintf(stderr, "%d\n", fftSig[i]);
-	}
+  int i;
+  for(i=0; i<inLen; i++){
+    fftSig[i] = (int)(10*fftSig[i]/(20*log10(fftSig[512])));
+    fprintf(stderr, "%d\n", fftSig[i]);
+  }
 }
+*/
 
 void
-fast_fft(int inLen, uint16_t *sig, unsigned int *fftSig)
+fast_fft(const int inLen, uint16_t *sig, unsigned int *fftSig)
 {
-	int i;
-	cplx *inputComponents;
-	cplx *outputComponents;
+  int i;
+  cplx *inputComponents;
+  cplx *outputComponents;
 
-	if(inLen % 2 != 0){
-		fprintf(stderr, "Note that the length of the array MUST be a power of 2.");
-		exit(EXIT_FAILURE);
-	}
-	inputComponents = (cplx*)malloc((inLen)*sizeof(cplx));
+  if(inLen % 2 != 0){
+    fprintf(stderr, "The length of the array MUST be a power of 2.");
+    exit(EXIT_FAILURE);
+  }
+  inputComponents = (cplx*)malloc((inLen)*sizeof(cplx));
 
-	for(i=1; i<inLen; i++){
-		inputComponents[i] = sig[i];
-	}
+  for(i=1; i<inLen; i++){
+    inputComponents[i] = sig[i];
+  }
 
-	outputComponents = _fast_ft(inputComponents, inLen);
-	for(i=0; i<inLen; i++){
-		fftSig[i] = amplitude(outputComponents[i], inLen);
-	}
-	/*normalize_fft(inLen, fftSig);*/
-	free(outputComponents);
+  outputComponents = _fast_ft(inputComponents, inLen);
+  for(i=0; i<inLen; i++){
+    fftSig[i] = amplitude(outputComponents[i], inLen);
+  }
+
+  free(outputComponents);
 }
 
 void