Parameter cleanup
* Boundary issue solved
* Nice simulation settings