name changes for consistency with practical
better parameters/initial conditions
Merge remote-tracking branch 'refs/remotes/origin/master'