Fixed bugs in timing; no-slip contact model