minor fixes
factor out into "one", to explore alternate flows