fix timeout bug, more log format fixes