PrepareContainer: Fixed bits and undo

Not all bits where copied from the original container before, which is
fixed now. Undoing the Prepare Container command did not work properly,
which was also fixed.