v2.0.0 release candidate.  Bug fixes, formatting, cleanup.