updated parameters, added second timestep, added relax density
merge done
fixed add pressure