some edits + new sections