clean up. add config support
cleanup. restart stream still bugged.