Issue 54. Clean up references.
Issue 27 provide wording.
Issue 57 status to review