Documentation updates to reflect the new changes. Minor code changes.