Made various edits