Finished Roozbeh's edits.