Many small edits