Updated documentation

Updated the documentation accordingly to all recent changes.