docs from marginalia; other updates
refinements