Comments and make NewClient feel less circular.
Merge branch 'master' into parser