More sensible timer/counter variables.
Merge pull request #2 from OddBloke/master

More sensible timer/counter variables.