some edits, add tags