various further edits