updates from jnthn++

untentativize somewhat