cleaned up some definitions and proofs for simulation