Update 2.0, individual file changes

Editing individual files to avoid overwriting others' work.