Minor fixes.  Works for byteswap again.  Now working on the new injection algorithm and working out those bugs.