amigo changes to commonjs-like env; tweaks