Updated documentation and fixed the reversions made by the last rebase.