Updated documentation rebase

Rebase of updated documentation into fludag tally merge