Eliminated digital sampling artifact, fixed edge truncation
Moved simulation parameters back to Simulation