Fix unused variables
Adapt simulation parameters a bit