Collision dynamics integration

Minor bug fixes.