Accidentally messed with the IDLE timeout period in last commit.

* Also cleaned up some comments.