Edits to the optimization section and other minor edits