Simulator Modifications Finalized

All but MCMC have been combed through, may be many semantic/syntactic
errors but synthesis is nearly done