Some more tweaks to the timing and end-behavior parameters.