Add new stream, clean up some URLs