various edits JF