Syntax clean-up
Bug fixes in FFT