Fixed send and finalized code.  To be branched after this check in.