Added fftw library and cleanup