minor updates to countdown and timeout