Improvements to atomwavtoatm; tested on 40 copy tapes

Change-Id: I139e4becc53a716672f69ddb7aa72f9d0d920ee4