Some revisions to content and bug fixes