fix problems with localparam and +; -: ranges
Merge branch 'datapath' into dev
Merge branch 'dev'