More edits to the final paper