some personal edits