Documentation Update

Merging docs from wolop branch