various small edits