Addresses copy changes 

needed in #15 and also takes the source order changes pushed in #17