Clean-up fork terminology and other small edits