update variable names; build-out local dict/funcs