Moved delay line for intermediates to sort and cancel unit. Also reduced delay in testbench accordingly to keep in sync. This should close #32, but still needs to be tested.