tweaks and fleshing-out