Stream changes, fix freeze and add settings