more edits getting styling up-to-date with master