With JBF edits, + lewis and history elaborations