Add some debugging and use preserve when scp-ing