Added log entry, added time-out, added comments