enh/fix/wip: nicer subs