color changes and other edits