Added delete originals option (-d)

Some minor changes