Beef up comments on what each of the timers mean

This also includes minor renaming of variables and removing two
boolean flags that can be encoded within the timer values themselves.
Address various review comments