Consolidated scripts
Fixed a bug in navre
Improved testbenches
Various testbench fixes/improvements