More edits to setting fields