Updated cms library with comments, and removed a few JSON obsolete calls.