security bug fix and text edits