ENH: refactored input parameters
ADD: averaging options + affine only option