Finally figured out what was wrong with some math I was doing earlier.  Figure 8 looks much better.
Oops, found a mistake in setting the max time.
Added comments.
Adding the bag file.