slight analysis
many relatively small edits