Fixed Issue + More DOCS