Rework the discussion section and make a few other minor changes.