Fixed sign of damping term, other cosmetics
Zero margin looks better, need to test
Parameter tuning, better collisions, damping