WIP: refinements to presentation