improved and fixed logs