diff --git a/CHANGELOG b/CHANGELOG
index 54d2070..bc8a1c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,14 +1,32 @@
-1.0
+
+1.1 : (Jan 30,2004)
+    split sample_code/ into test/ and tools/
+
+    Removed 2-D fft and added N-D fft (arbitrary)
+
+    modified fftutil.c to allow multi-d FFTs
+
+    Modified core fft routine to allow an input stride via kiss_fft_stride()
+    (eased support of multi-D ffts)
+
+    Added fast convolution filtering (FIR filtering using overlap-scrap method, with tail scrap)
+
+    Add kfc.[ch]: the KISS FFT Cache. It takes care of allocs for you ( suggested by Oscar Lesta ).
+
+1.0.1 (Dec 15, 2003)
+    fixed bug that occurred when nfft==1
+    
+1.0 : (Dec 14, 2003)
     changed kiss_fft function from using a single buffer, to two buffers.
     If the same buffer pointer is supplied for both in and out, kiss will
     manage the buffer copies.
 
     added kiss_fft2d and kiss_fftr as separate source files (declarations in kiss_fft.h )
 
-0.4 : optimized for radix 2,3,4,5
+0.4 :(Nov 4,2003) optimized for radix 2,3,4,5
 
-0.3 : woops, version 2 didn't actually factor out any radices other than 2
+0.3 :(Oct 28, 2003) woops, version 2 didn't actually factor out any radices other than 2
 
-0.2 : added mixed radix, only radix 2,4 optimized versions
+0.2 :(Oct 27, 2003) added mixed radix, only radix 2,4 optimized versions
 
-0.1 :  initial release, radix 2 only
+0.1 :(May 19 2003)  initial release, radix 2 only
diff --git a/Makefile b/Makefile
index 02e8b8c..e52a401 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 message:
-	@echo "Nothing to make here.  Move on down to sample_code for ... "
-	@echo "real FFTs, 2-d FFTs and you guessed it! Sample Code!"
+	@echo "Nothing to make here.  Move on down to test/ for self test stuff"
+	@echo "or tools/ for real FFTs, multi-d FFTs, fast convolution filtering, cacher"
 
 tarball: clean
 	find | grep -i -v cvs | zip kiss_fft.zip -@
 	tar --exclude CVS --exclude .cvsignore --exclude kiss_fft.zip -cvzf kiss_fft.tar.gz .
 
 clean:
-	cd sample_code && make clean
+	cd test && make clean
+	cd tools && make clean
 	rm -f kiss_fft.tar.gz *~ *.pyc kiss_fft.zip 
 
diff --git a/kiss_fft.h b/kiss_fft.h
index e0444ec..9c9f3cc 100644
--- a/kiss_fft.h
+++ b/kiss_fft.h
@@ -8,8 +8,14 @@
 
 /*
  ATTENTION!
- If you would like a real-only FFT, see sample_code/kiss_fftr.c and .h
- If you would like a 2-dimensional FFT, see sample_code/kiss_fft2d.c and .h
+ If you would like a :
+ -- a utility that will handle the caching of fft objects
+ -- real-only FFT
+ -- a multi-dimensional FFT
+ -- a command-line utility to perform ffts
+ -- a command-line utility to perform fast-convolution filtering
+
+ then see tools/
  */
 
 #ifdef FIXED_POINT
diff --git a/test/Makefile b/test/Makefile
index 17f8009..0f71b65 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -37,10 +37,10 @@ endif
 all: $(BENCHKISS) $(SELFTEST) $(BENCHFFTW) $(TESTREAL) $(FFTUTIL) \
 	$(TESTKFC) $(FASTFILT) $(FASTFILTREAL)
 
-CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer 
+#CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer 
 #-DUSE_SKIP 
 # If the above flags do not work, try the following
-#CFLAGS=-Wall -O3
+CFLAGS=-Wall -O3
 
 $(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR -lm $+ -DFAST_FILT_UTIL
diff --git a/tools/Makefile b/tools/Makefile
index 17f8009..0f71b65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -37,10 +37,10 @@ endif
 all: $(BENCHKISS) $(SELFTEST) $(BENCHFFTW) $(TESTREAL) $(FFTUTIL) \
 	$(TESTKFC) $(FASTFILT) $(FASTFILTREAL)
 
-CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer 
+#CFLAGS=-Wall -O3 -pedantic -march=pentiumpro -ffast-math -fomit-frame-pointer 
 #-DUSE_SKIP 
 # If the above flags do not work, try the following
-#CFLAGS=-Wall -O3
+CFLAGS=-Wall -O3
 
 $(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c
 	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR -lm $+ -DFAST_FILT_UTIL