Added fft_mask
Other fixes & enhancements