Code review updates

These are updates based on your code review so far.  I put them in a branch off of channelwad.
New test function just to make sure I'm exercising the timeout functionality.