Made changes, added some content that was removed, fixed formatting