remove wrong NormalForce processing & fix bug of conservation of momentum