added streaming + some config updates