some slight edits