Security, attachment, misc edits