Add back optional timer. Improve docs.