Done. Only smaller edits remain