wip: correct @pnkfelix nits