Adding in checks for exiting as well as a few new streamers