Simplified timer code, added toggle for pending functionality, etc.

I hope you don't hate me for making more changes. I just thought I could do what I want on my fork while you make your changes, and then you could just decide what you want to keep when you resolve any merge conflicts. Anyway, I'll wait until you do your stuff now.