Added support for ordered input and output + cosmetics
Added support for overridden parameters + cosmetics