Fixed bug in calculation of energy dissipated during impact (energy is conserved to within 5.6e-16 across the current set of test scenarios). Reorganized this calculation to avoid storing the velocities at the beginning of the interval. Also checking in clarifying comments and miscellaneous code improvements made during review with Sherm.