minor updates; cross-compat with underscore/lodash