Docs, code cleanups.
Fixing json tags.