Added doc-strings and fixed print messages