Updated modules to have correct default parameters and options
Added option to parameterise against electr + ind for s22 set