undo wip: fixes + smoke test