924 edits

additional edits to appease bug 924 requirements