made a bunch of revisions toward DC suggestions