Renaming variables, completing doc.