minor fixed + log message enhancement