Add a reference. Correct other issues.