definitions-free, only cited equations
almost ready
merged from upstream
all done, awaiting final remarks from valerie