Fix parameters
Trim trailing spaces
Add AXI stream mux and testbench