Fixed FIR trick
Improved handling of images, removed to specific classes