Fixed initial parameter-values of the Container
Updated TODO: Bug with undoing prepare command