added doc-string and log-messages