improved timeout.
minor
logger
changed function param format.