Merge "improve fir tool: cleanup, better default, bug fixes"