Integrate more of Cole's edits