improve log and #4