Fixed document generation errors, also redid commits which were lost
during the rebase process.