Added display of removed units, refactoring copy units a bit in the
process